From 8e9bb962ac05cf239f1f7cc3591b83196cd61236 Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Tue, 25 Feb 2025 14:51:41 +0100 Subject: [PATCH 01/41] introduce seperate test events handlers in junit5 instrumentations --- .../junit5/CucumberTracingListener.java | 94 +++++++------ .../JUnit5CucumberSkipInstrumentation.java | 9 +- .../src/test/groovy/CucumberTest.groovy | 4 +- .../order/JUnit5TestOrderInstrumentation.java | 10 +- .../src/test/groovy/JUnit58Test.groovy | 4 +- .../JUnit5SpockSkipInstrumentation.java | 12 +- .../junit5/SpockTracingListener.java | 126 ++++++++++-------- .../src/test/groovy/SpockTest.groovy | 4 +- .../junit5/JUnit5Instrumentation.java | 9 +- .../junit5/JUnit5SkipInstrumentation.java | 9 +- .../junit5/JUnitPlatformUtils.java | 13 ++ .../junit5/TestEventsHandlerHolder.java | 38 ++++-- .../junit5/TracingListener.java | 126 ++++++++++-------- .../JUnit5ExecutionInstrumentation.java | 4 +- .../src/test/groovy/JUnit5Test.groovy | 3 +- .../selenium/AbstractSeleniumTest.groovy | 4 +- 16 files changed, 293 insertions(+), 176 deletions(-) diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/CucumberTracingListener.java b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/CucumberTracingListener.java index 381de8066a7..e346ef9425e 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/CucumberTracingListener.java +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/CucumberTracingListener.java @@ -65,16 +65,18 @@ private void containerExecutionStarted(final TestDescriptor suiteDescriptor) { String testSuiteName = CucumberUtils.getFeatureName(suiteDescriptor); List tags = suiteDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList()); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteStart( - suiteDescriptor, - testSuiteName, - testFramework, - testFrameworkVersion, - null, - tags, - false, - TestFrameworkInstrumentation.CUCUMBER, - null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestSuiteStart( + suiteDescriptor, + testSuiteName, + testFramework, + testFrameworkVersion, + null, + tags, + false, + TestFrameworkInstrumentation.CUCUMBER, + null); } private void containerExecutionFinished( @@ -87,16 +89,22 @@ private void containerExecutionFinished( if (throwable != null) { if (JUnitPlatformUtils.isAssumptionFailure(throwable)) { String reason = throwable.getMessage(); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteSkip(suiteDescriptor, reason); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestSuiteSkip(suiteDescriptor, reason); for (TestDescriptor child : suiteDescriptor.getChildren()) { executionSkipped(child, reason); } } else { - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFailure(suiteDescriptor, throwable); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestSuiteFailure(suiteDescriptor, throwable); } } - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFinish(suiteDescriptor, null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestSuiteFinish(suiteDescriptor, null); } private void testCaseExecutionStarted(final TestDescriptor testDescriptor) { @@ -115,17 +123,19 @@ private void testResourceExecutionStarted( String testName = names.getRight(); List tags = testDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList()); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestStart( - suiteDescriptor, - testDescriptor, - testName, - testFramework, - testFrameworkVersion, - null, - tags, - TestSourceData.UNKNOWN, - null, - TestEventsHandlerHolder.getExecutionHistory(testDescriptor)); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestStart( + suiteDescriptor, + testDescriptor, + testName, + testFramework, + testFrameworkVersion, + null, + tags, + TestSourceData.UNKNOWN, + null, + TestEventsHandlerHolder.getExecutionHistory(testDescriptor)); CoveragePerTestBridge.recordCoverage(classpathResourceName); } @@ -143,16 +153,20 @@ private void testResourceExecutionFinished( Throwable throwable = testExecutionResult.getThrowable().orElse(null); if (throwable != null) { if (JUnitPlatformUtils.isAssumptionFailure(throwable)) { - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSkip( - testDescriptor, throwable.getMessage()); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestSkip(testDescriptor, throwable.getMessage()); } else { - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFailure(testDescriptor, throwable); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestFailure(testDescriptor, throwable); } } TestExecutionHistory executionHistory = TestEventsHandlerHolder.getExecutionHistory(testDescriptor); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFinish( - testDescriptor, null, executionHistory); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestFinish(testDescriptor, null, executionHistory); } @Override @@ -172,15 +186,17 @@ private void testResourceExecutionSkipped( String testName = names.getRight(); List tags = testDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList()); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestIgnore( - suiteDescriptor, - testDescriptor, - testName, - testFramework, - testFrameworkVersion, - null, - tags, - TestSourceData.UNKNOWN, - reason); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestIgnore( + suiteDescriptor, + testDescriptor, + testName, + testFramework, + testFrameworkVersion, + null, + tags, + TestSourceData.UNKNOWN, + reason); } } diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberSkipInstrumentation.java b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberSkipInstrumentation.java index 08a1843ab2d..eef612bea28 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberSkipInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/JUnit5CucumberSkipInstrumentation.java @@ -11,7 +11,9 @@ import datadog.trace.api.Config; import datadog.trace.api.civisibility.InstrumentationBridge; import datadog.trace.api.civisibility.config.TestIdentifier; +import datadog.trace.api.civisibility.events.TestEventsHandler; import datadog.trace.api.civisibility.telemetry.tag.SkipReason; +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.Collection; import java.util.Set; @@ -90,7 +92,10 @@ public static void shouldBeSkipped( return; } - if (TestEventsHandlerHolder.TEST_EVENTS_HANDLER == null) { + TestEventsHandler testEventsHandler = + TestEventsHandlerHolder.HANDLERS.get(TestFrameworkInstrumentation.CUCUMBER); + + if (testEventsHandler == null) { // should only happen in integration tests // because we cannot avoid instrumenting ourselves return; @@ -101,7 +106,7 @@ public static void shouldBeSkipped( return; } - SkipReason skipReason = TestEventsHandlerHolder.TEST_EVENTS_HANDLER.skipReason(test); + SkipReason skipReason = testEventsHandler.skipReason(test); if (skipReason == null) { return; } diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy index 77320253f2b..c2735c0e590 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy @@ -1,7 +1,9 @@ import datadog.trace.api.DisableTestTrace import datadog.trace.api.civisibility.config.TestFQN import datadog.trace.api.civisibility.config.TestIdentifier +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation import datadog.trace.civisibility.CiVisibilityInstrumentationTest + import datadog.trace.instrumentation.junit5.TestEventsHandlerHolder import io.cucumber.core.api.TypeRegistry import io.cucumber.core.options.Constants @@ -221,7 +223,7 @@ class CucumberTest extends CiVisibilityInstrumentationTest { } protected void runFeatures(List classpathFeatures, boolean parallel, boolean expectSuccess = true) { - TestEventsHandlerHolder.startForcefully() + TestEventsHandlerHolder.startForcefully(TestFrameworkInstrumentation.CUCUMBER) DiscoverySelector[] selectors = new DiscoverySelector[classpathFeatures.size()] for (i in 0.. hierarchyMatcher() { @Override public String[] helperClassNames() { return new String[] { - parentPackageName + ".TestEventsHandlerHolder", + parentPackageName + ".JUnit5Framework", parentPackageName + ".JUnitPlatformUtils", + parentPackageName + ".TestEventsHandlerHolder", packageName + ".JUnit5OrderUtils", packageName + ".FailFastClassOrderer", packageName + ".FailFastMethodOrderer", @@ -90,7 +92,8 @@ public static void onGetClassOrdererExit( classOrderer = Optional.of( new FailFastClassOrderer( - TestEventsHandlerHolder.TEST_EVENTS_HANDLER, classOrderer.orElse(null))); + TestEventsHandlerHolder.HANDLERS.get(TestFrameworkInstrumentation.JUNIT5), + classOrderer.orElse(null))); } else { throw new IllegalArgumentException("Unknown test order: " + testOrder); } @@ -118,7 +121,8 @@ public static void onGetMethodOrdererExit( methodOrderer = Optional.of( new FailFastMethodOrderer( - TestEventsHandlerHolder.TEST_EVENTS_HANDLER, methodOrderer.orElse(null))); + TestEventsHandlerHolder.HANDLERS.get(TestFrameworkInstrumentation.JUNIT5), + methodOrderer.orElse(null))); } else { throw new IllegalArgumentException("Unknown test order: " + testOrder); } diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy index 7079be44751..79b9e6e5211 100644 --- a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy @@ -1,6 +1,8 @@ import datadog.trace.api.DisableTestTrace import datadog.trace.api.civisibility.CIConstants +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation import datadog.trace.civisibility.CiVisibilityInstrumentationTest + import datadog.trace.instrumentation.junit5.TestEventsHandlerHolder import org.example.* import org.junit.jupiter.api.ClassOrderer @@ -89,7 +91,7 @@ class JUnit58Test extends CiVisibilityInstrumentationTest { } private static void runTests(List> tests, boolean expectSuccess = true) { - TestEventsHandlerHolder.startForcefully() + TestEventsHandlerHolder.startForcefully(TestFrameworkInstrumentation.JUNIT5) DiscoverySelector[] selectors = new DiscoverySelector[tests.size()] for (i in 0.. testEventsHandler = + TestEventsHandlerHolder.HANDLERS.get(TestFrameworkInstrumentation.SPOCK); + + if (testEventsHandler == null) { // should only happen in integration tests // because we cannot avoid instrumenting ourselves return; @@ -120,8 +125,7 @@ public static void shouldBeSkipped( if (featureIdentifier == null) { return; } - SkipReason skipReason = - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.skipReason(featureIdentifier); + SkipReason skipReason = testEventsHandler.skipReason(featureIdentifier); if (skipReason == null) { return; } @@ -146,7 +150,7 @@ public static void shouldBeSkipped( if (test == null) { return; } - SkipReason skipReason = TestEventsHandlerHolder.TEST_EVENTS_HANDLER.skipReason(test); + SkipReason skipReason = testEventsHandler.skipReason(test); if (skipReason == null) { return; } diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/SpockTracingListener.java b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/SpockTracingListener.java index 449ee106326..d11a512a750 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/SpockTracingListener.java +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/main/java/datadog/trace/instrumentation/junit5/SpockTracingListener.java @@ -64,16 +64,18 @@ private void containerExecutionStarted(final TestDescriptor suiteDescriptor) { testClass != null ? testClass.getName() : suiteDescriptor.getLegacyReportingName(); List tags = suiteDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList()); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteStart( - suiteDescriptor, - testSuiteName, - testFramework, - testFrameworkVersion, - testClass, - tags, - false, - TestFrameworkInstrumentation.SPOCK, - null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.SPOCK) + .onTestSuiteStart( + suiteDescriptor, + testSuiteName, + testFramework, + testFrameworkVersion, + testClass, + tags, + false, + TestFrameworkInstrumentation.SPOCK, + null); } private void containerExecutionFinished( @@ -87,18 +89,24 @@ private void containerExecutionFinished( if (JUnitPlatformUtils.isAssumptionFailure(throwable)) { String reason = throwable.getMessage(); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteSkip(suiteDescriptor, reason); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.SPOCK) + .onTestSuiteSkip(suiteDescriptor, reason); for (TestDescriptor child : suiteDescriptor.getChildren()) { executionSkipped(child, reason); } } else { - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFailure(suiteDescriptor, throwable); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.SPOCK) + .onTestSuiteFailure(suiteDescriptor, throwable); } } - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFinish(suiteDescriptor, null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.SPOCK) + .onTestSuiteFinish(suiteDescriptor, null); } private void testCaseExecutionStarted(final TestDescriptor testDescriptor) { @@ -116,17 +124,19 @@ private void testMethodExecutionStarted(TestDescriptor testDescriptor, MethodSou testDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList()); TestSourceData testSourceData = SpockUtils.toTestSourceData(testDescriptor); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestStart( - suiteDescriptor, - testDescriptor, - displayName, - testFramework, - testFrameworkVersion, - testParameters, - tags, - testSourceData, - null, - TestEventsHandlerHolder.getExecutionHistory(testDescriptor)); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.SPOCK) + .onTestStart( + suiteDescriptor, + testDescriptor, + displayName, + testFramework, + testFrameworkVersion, + testParameters, + tags, + testSourceData, + null, + TestEventsHandlerHolder.getExecutionHistory(testDescriptor)); } private void testCaseExecutionFinished( @@ -137,21 +147,25 @@ private void testCaseExecutionFinished( } } - private static void testMethodExecutionFinished( + private void testMethodExecutionFinished( TestDescriptor testDescriptor, TestExecutionResult testExecutionResult) { Throwable throwable = testExecutionResult.getThrowable().orElse(null); if (throwable != null) { if (JUnitPlatformUtils.isAssumptionFailure(throwable)) { - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSkip( - testDescriptor, throwable.getMessage()); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.SPOCK) + .onTestSkip(testDescriptor, throwable.getMessage()); } else { - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFailure(testDescriptor, throwable); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.SPOCK) + .onTestFailure(testDescriptor, throwable); } } TestExecutionHistory executionHistory = TestEventsHandlerHolder.getExecutionHistory(testDescriptor); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFinish( - testDescriptor, null, executionHistory); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.SPOCK) + .onTestFinish(testDescriptor, null, executionHistory); } @Override @@ -179,23 +193,29 @@ private void containerExecutionSkipped( List tags = suiteDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList()); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteStart( - suiteDescriptor, - testSuiteName, - testFramework, - testFrameworkVersion, - testClass, - tags, - false, - TestFrameworkInstrumentation.SPOCK, - null); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteSkip(suiteDescriptor, reason); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.SPOCK) + .onTestSuiteStart( + suiteDescriptor, + testSuiteName, + testFramework, + testFrameworkVersion, + testClass, + tags, + false, + TestFrameworkInstrumentation.SPOCK, + null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.SPOCK) + .onTestSuiteSkip(suiteDescriptor, reason); for (TestDescriptor child : suiteDescriptor.getChildren()) { executionSkipped(child, reason); } - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFinish(suiteDescriptor, null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.SPOCK) + .onTestSuiteFinish(suiteDescriptor, null); } private void testMethodExecutionSkipped( @@ -207,15 +227,17 @@ private void testMethodExecutionSkipped( testDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList()); TestSourceData testSourceData = SpockUtils.toTestSourceData(testDescriptor); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestIgnore( - suiteDescriptor, - testDescriptor, - displayName, - testFramework, - testFrameworkVersion, - testParameters, - tags, - testSourceData, - reason); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.SPOCK) + .onTestIgnore( + suiteDescriptor, + testDescriptor, + displayName, + testFramework, + testFrameworkVersion, + testParameters, + tags, + testSourceData, + reason); } } diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy index 67fbc23b3fe..4885eea00b6 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy @@ -1,9 +1,11 @@ import datadog.trace.api.DisableTestTrace import datadog.trace.api.civisibility.config.TestFQN import datadog.trace.api.civisibility.config.TestIdentifier +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation import datadog.trace.civisibility.CiVisibilityInstrumentationTest import datadog.trace.civisibility.diff.FileDiff import datadog.trace.civisibility.diff.LineDiff + import datadog.trace.instrumentation.junit5.TestEventsHandlerHolder import org.example.TestFailedParameterizedSpock import org.example.TestFailedSpock @@ -211,7 +213,7 @@ class SpockTest extends CiVisibilityInstrumentationTest { } private static void runTests(List> classes, boolean expectSuccess = true) { - TestEventsHandlerHolder.startForcefully() + TestEventsHandlerHolder.startForcefully(TestFrameworkInstrumentation.SPOCK) DiscoverySelector[] selectors = new DiscoverySelector[classes.size()] for (i in 0.. contextStore = InstrumentationContext.get(TestDescriptor.class, Object.class); TestEventsHandlerHolder.setContextStores( (ContextStore) contextStore, (ContextStore) contextStore); - TestEventsHandlerHolder.start(); + TestEventsHandlerHolder.start(testEngine); } } @@ -94,9 +95,7 @@ public static class JUnit5Advice { public static void addTracingListener( @Advice.This TestEngine testEngine, @Advice.Argument(value = 0, readOnly = false) ExecutionRequest executionRequest) { - String testEngineClassName = testEngine.getClass().getName(); - if (testEngineClassName.startsWith("io.cucumber") - || testEngineClassName.startsWith("org.spockframework")) { + if (JUnitPlatformUtils.engineToFramework(testEngine) != TestFrameworkInstrumentation.JUNIT5) { // Cucumber and Spock have dedicated instrumentations. // We can only filter out calls to their engines at runtime, // since they do not declare their own "execute" method, diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SkipInstrumentation.java b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SkipInstrumentation.java index 39a44f76c0a..212130a6235 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SkipInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnit5SkipInstrumentation.java @@ -12,7 +12,9 @@ import datadog.trace.api.Config; import datadog.trace.api.civisibility.InstrumentationBridge; import datadog.trace.api.civisibility.config.TestIdentifier; +import datadog.trace.api.civisibility.events.TestEventsHandler; import datadog.trace.api.civisibility.telemetry.tag.SkipReason; +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.Collection; import java.util.Set; @@ -86,7 +88,10 @@ public static void shouldBeSkipped( return; } - if (TestEventsHandlerHolder.TEST_EVENTS_HANDLER == null) { + TestEventsHandler testEventsHandler = + TestEventsHandlerHolder.HANDLERS.get(TestFrameworkInstrumentation.JUNIT5); + + if (testEventsHandler == null) { // should only happen in integration tests // because we cannot avoid instrumenting ourselves return; @@ -96,7 +101,7 @@ public static void shouldBeSkipped( if (test == null) { return; } - SkipReason skipReason = TestEventsHandlerHolder.TEST_EVENTS_HANDLER.skipReason(test); + SkipReason skipReason = testEventsHandler.skipReason(test); if (skipReason == null) { return; } diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java index ba9382c6f9f..0c212bce5ad 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java +++ b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java @@ -4,6 +4,7 @@ import datadog.trace.api.civisibility.config.TestIdentifier; import datadog.trace.api.civisibility.config.TestSourceData; +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; @@ -18,6 +19,7 @@ import org.junit.platform.commons.util.ClassLoaderUtils; import org.junit.platform.commons.util.ReflectionUtils; import org.junit.platform.engine.TestDescriptor; +import org.junit.platform.engine.TestEngine; import org.junit.platform.engine.TestSource; import org.junit.platform.engine.UniqueId; import org.junit.platform.engine.support.descriptor.ClassSource; @@ -205,4 +207,15 @@ public static TestDescriptor getSuiteDescriptor(TestDescriptor testDescriptor) { } return testDescriptor; } + + public static TestFrameworkInstrumentation engineToFramework(TestEngine testEngine) { + String testEngineClassName = testEngine.getClass().getName(); + if (testEngineClassName.startsWith("io.cucumber")) { + return TestFrameworkInstrumentation.CUCUMBER; + } else if (testEngineClassName.startsWith("org.spockframework")) { + return TestFrameworkInstrumentation.SPOCK; + } else { + return TestFrameworkInstrumentation.JUNIT5; + } + } } diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java index cb209741bb1..5be57d2eeee 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java +++ b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java @@ -5,13 +5,20 @@ import datadog.trace.api.civisibility.InstrumentationBridge; import datadog.trace.api.civisibility.events.TestEventsHandler; import datadog.trace.api.civisibility.execution.TestExecutionHistory; +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation; import datadog.trace.bootstrap.ContextStore; import datadog.trace.util.AgentThreadFactory; +import java.util.HashMap; +import java.util.Map; import org.junit.platform.engine.TestDescriptor; +import org.junit.platform.engine.TestEngine; public abstract class TestEventsHandlerHolder { - public static volatile TestEventsHandler TEST_EVENTS_HANDLER; + // store one handler per framework running + public static Map> + HANDLERS = new HashMap<>(); + public static volatile TestEventsHandler DEFAULT_HANDLER; private static ContextStore SUITE_STORE; private static ContextStore TEST_STORE; private static volatile ContextStore @@ -59,25 +66,36 @@ public static TestExecutionHistory getExecutionHistory(TestDescriptor testDescri } } - public static synchronized void start() { - if (TEST_EVENTS_HANDLER == null) { - TEST_EVENTS_HANDLER = - InstrumentationBridge.createTestEventsHandler("junit", SUITE_STORE, TEST_STORE); + public static synchronized void start(TestEngine testEngine) { + TestFrameworkInstrumentation framework = JUnitPlatformUtils.engineToFramework(testEngine); + TestEventsHandler handler = HANDLERS.get(framework); + if (handler == null) { + handler = InstrumentationBridge.createTestEventsHandler("junit", SUITE_STORE, TEST_STORE); + HANDLERS.put(framework, handler); + if (DEFAULT_HANDLER == null) { + DEFAULT_HANDLER = handler; + } } } // used by instrumentation tests - public static synchronized void startForcefully() { + public static synchronized void startForcefully(TestFrameworkInstrumentation framework) { if (SUITE_STORE != null && TEST_STORE != null) { - TEST_EVENTS_HANDLER = + TestEventsHandler handler = InstrumentationBridge.createTestEventsHandler("junit", SUITE_STORE, TEST_STORE); + HANDLERS.put(framework, handler); + DEFAULT_HANDLER = handler; } } public static synchronized void stop() { - if (TEST_EVENTS_HANDLER != null) { - TEST_EVENTS_HANDLER.close(); - TEST_EVENTS_HANDLER = null; + for (Map.Entry> + entry : HANDLERS.entrySet()) { + entry.getValue().close(); + } + if (DEFAULT_HANDLER != null) { + DEFAULT_HANDLER.close(); + DEFAULT_HANDLER = null; } } diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TracingListener.java b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TracingListener.java index 32874780b13..24f794b83dd 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TracingListener.java +++ b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TracingListener.java @@ -65,16 +65,18 @@ private void containerExecutionStarted(final TestDescriptor suiteDescriptor) { testClass != null ? testClass.getName() : suiteDescriptor.getLegacyReportingName(); List tags = suiteDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList()); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteStart( - suiteDescriptor, - testSuiteName, - testFramework, - testFrameworkVersion, - testClass, - tags, - false, - TestFrameworkInstrumentation.JUNIT5, - null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT5) + .onTestSuiteStart( + suiteDescriptor, + testSuiteName, + testFramework, + testFrameworkVersion, + testClass, + tags, + false, + TestFrameworkInstrumentation.JUNIT5, + null); } private void containerExecutionFinished( @@ -87,16 +89,22 @@ private void containerExecutionFinished( if (throwable != null) { if (JUnitPlatformUtils.isAssumptionFailure(throwable)) { String reason = throwable.getMessage(); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteSkip(suiteDescriptor, reason); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT5) + .onTestSuiteSkip(suiteDescriptor, reason); for (TestDescriptor child : suiteDescriptor.getChildren()) { executionSkipped(child, reason); } } else { - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFailure(suiteDescriptor, throwable); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT5) + .onTestSuiteFailure(suiteDescriptor, throwable); } } - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFinish(suiteDescriptor, null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT5) + .onTestSuiteFinish(suiteDescriptor, null); } private void testCaseExecutionStarted(final TestDescriptor testDescriptor) { @@ -116,17 +124,19 @@ private void testMethodExecutionStarted(TestDescriptor testDescriptor, MethodSou testDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList()); TestSourceData testSourceData = JUnitPlatformUtils.toTestSourceData(testDescriptor); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestStart( - suiteDescriptor, - testDescriptor, - testName, - testFramework, - testFrameworkVersion, - testParameters, - tags, - testSourceData, - null, - TestEventsHandlerHolder.getExecutionHistory(testDescriptor)); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT5) + .onTestStart( + suiteDescriptor, + testDescriptor, + testName, + testFramework, + testFrameworkVersion, + testParameters, + tags, + testSourceData, + null, + TestEventsHandlerHolder.getExecutionHistory(testDescriptor)); } private void testCaseExecutionFinished( @@ -137,21 +147,25 @@ private void testCaseExecutionFinished( } } - private static void testMethodExecutionFinished( + private void testMethodExecutionFinished( TestDescriptor testDescriptor, TestExecutionResult testExecutionResult) { Throwable throwable = testExecutionResult.getThrowable().orElse(null); if (throwable != null) { if (JUnitPlatformUtils.isAssumptionFailure(throwable)) { - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSkip( - testDescriptor, throwable.getMessage()); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT5) + .onTestSkip(testDescriptor, throwable.getMessage()); } else { - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFailure(testDescriptor, throwable); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT5) + .onTestFailure(testDescriptor, throwable); } } TestExecutionHistory executionHistory = TestEventsHandlerHolder.getExecutionHistory(testDescriptor); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFinish( - testDescriptor, null, executionHistory); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT5) + .onTestFinish(testDescriptor, null, executionHistory); } @Override @@ -180,23 +194,29 @@ private void containerExecutionSkipped( List tags = suiteDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList()); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteStart( - suiteDescriptor, - testSuiteName, - testFramework, - testFrameworkVersion, - testClass, - tags, - false, - TestFrameworkInstrumentation.JUNIT5, - null); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteSkip(suiteDescriptor, reason); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT5) + .onTestSuiteStart( + suiteDescriptor, + testSuiteName, + testFramework, + testFrameworkVersion, + testClass, + tags, + false, + TestFrameworkInstrumentation.JUNIT5, + null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT5) + .onTestSuiteSkip(suiteDescriptor, reason); for (TestDescriptor child : suiteDescriptor.getChildren()) { executionSkipped(child, reason); } - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFinish(suiteDescriptor, null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT5) + .onTestSuiteFinish(suiteDescriptor, null); } private void testMethodExecutionSkipped( @@ -210,15 +230,17 @@ private void testMethodExecutionSkipped( testDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList()); TestSourceData testSourceData = JUnitPlatformUtils.toTestSourceData(testDescriptor); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestIgnore( - suiteDescriptor, - testDescriptor, - testName, - testFramework, - testFrameworkVersion, - testParameters, - tags, - testSourceData, - reason); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT5) + .onTestIgnore( + suiteDescriptor, + testDescriptor, + testName, + testFramework, + testFrameworkVersion, + testParameters, + tags, + testSourceData, + reason); } } diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionInstrumentation.java b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionInstrumentation.java index 53bdd76a58f..ebf90a7f27c 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionInstrumentation.java @@ -112,7 +112,7 @@ public static class ExecutionAdvice { @SuppressFBWarnings("NP_BOOLEAN_RETURN_NULL") @Advice.OnMethodEnter(skipOn = Boolean.class) public static Boolean execute(@Advice.This HierarchicalTestExecutorService.TestTask testTask) { - if (TestEventsHandlerHolder.TEST_EVENTS_HANDLER == null) { + if (TestEventsHandlerHolder.DEFAULT_HANDLER == null) { // is possible when running tracer's instrumentation tests return null; } @@ -138,7 +138,7 @@ public static Boolean execute(@Advice.This HierarchicalTestExecutorService.TestT TestIdentifier testIdentifier = TestDataFactory.createTestIdentifier(testDescriptor); TestSourceData testSource = TestDataFactory.createTestSourceData(testDescriptor); TestExecutionPolicy executionPolicy = - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.executionPolicy(testIdentifier, testSource); + TestEventsHandlerHolder.DEFAULT_HANDLER.executionPolicy(testIdentifier, testSource); if (!executionPolicy.applicable()) { return null; } diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy b/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy index ffd7578cc4e..861baf0c2e6 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy @@ -1,6 +1,7 @@ import datadog.trace.api.DisableTestTrace import datadog.trace.api.civisibility.config.TestFQN import datadog.trace.api.civisibility.config.TestIdentifier +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation import datadog.trace.civisibility.CiVisibilityInstrumentationTest import datadog.trace.civisibility.diff.FileDiff import datadog.trace.civisibility.diff.LineDiff @@ -244,7 +245,7 @@ class JUnit5Test extends CiVisibilityInstrumentationTest { } protected void runTests(List> tests, boolean expectSuccess = true) { - TestEventsHandlerHolder.startForcefully() + TestEventsHandlerHolder.startForcefully(TestFrameworkInstrumentation.JUNIT5) DiscoverySelector[] selectors = new DiscoverySelector[tests.size()] for (i in 0..> tests) { - TestEventsHandlerHolder.startForcefully() + TestEventsHandlerHolder.startForcefully(TestFrameworkInstrumentation.JUNIT5) DiscoverySelector[] selectors = new DiscoverySelector[tests.size()] for (i in 0.. Date: Tue, 25 Feb 2025 15:09:01 +0100 Subject: [PATCH 02/41] clear junit5 handler map on close --- .../trace/instrumentation/junit5/TestEventsHandlerHolder.java | 1 + 1 file changed, 1 insertion(+) diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java index 5be57d2eeee..af432bf5395 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java +++ b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java @@ -93,6 +93,7 @@ public static synchronized void stop() { entry : HANDLERS.entrySet()) { entry.getValue().close(); } + HANDLERS.clear(); if (DEFAULT_HANDLER != null) { DEFAULT_HANDLER.close(); DEFAULT_HANDLER = null; From b8c748fc90bf1b81d0aa9bb33283cf2ee94c9897 Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Tue, 25 Feb 2025 16:31:30 +0100 Subject: [PATCH 03/41] introduce separate test events handlers in junit4 instrumentations --- .../junit4/CucumberTracingListener.java | 123 ++++++++------ .../junit4/JUnit4CucumberInstrumentation.java | 3 + .../JUnit4CucumberSkipInstrumentation.java | 6 +- .../Cucumber4ExecutionInstrumentation.java | 6 +- .../src/test/groovy/CucumberTest.groovy | 5 +- .../src/test/groovy/JUnit413Test.groovy | 3 +- .../junit4/MUnitInstrumentation.java | 3 + .../junit4/MUnitTracingListener.java | 155 +++++++++++------- .../MUnitExecutionInstrumentation.java | 6 +- .../src/test/groovy/MUnitTest.groovy | 5 +- .../junit4/JUnit4Instrumentation.java | 3 + .../junit4/JUnit4SkipInstrumentation.java | 6 +- .../junit4/JUnit4TracingListener.java | 123 ++++++++------ .../junit4/TestEventsHandlerHolder.java | 29 +++- .../JUnit4ExecutionInstrumentation.java | 7 +- .../src/test/groovy/JUnit4Test.groovy | 3 +- 16 files changed, 302 insertions(+), 184 deletions(-) diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/CucumberTracingListener.java b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/CucumberTracingListener.java index 4de59bbef9b..28b94f42360 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/CucumberTracingListener.java +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/CucumberTracingListener.java @@ -44,16 +44,18 @@ public void testSuiteStarted(final Description description) { if (isFeature(description)) { TestSuiteDescriptor suiteDescriptor = CucumberUtils.toSuiteDescriptor(description); String testSuiteName = CucumberUtils.getTestSuiteNameForFeature(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteStart( - suiteDescriptor, - testSuiteName, - FRAMEWORK_NAME, - FRAMEWORK_VERSION, - null, - Collections.emptyList(), - false, - TestFrameworkInstrumentation.CUCUMBER, - null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestSuiteStart( + suiteDescriptor, + testSuiteName, + FRAMEWORK_NAME, + FRAMEWORK_VERSION, + null, + Collections.emptyList(), + false, + TestFrameworkInstrumentation.CUCUMBER, + null); } } @@ -61,7 +63,9 @@ public void testSuiteStarted(final Description description) { public void testSuiteFinished(final Description description) { if (isFeature(description)) { TestSuiteDescriptor suiteDescriptor = CucumberUtils.toSuiteDescriptor(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFinish(suiteDescriptor, null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestSuiteFinish(suiteDescriptor, null); } } @@ -71,17 +75,19 @@ public void testStarted(final Description description) { String testName = CucumberUtils.getTestNameForScenario(description); List categories = getCategories(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestStart( - new TestSuiteDescriptor(testSuiteName, null), - CucumberUtils.toTestDescriptor(description), - testName, - FRAMEWORK_NAME, - FRAMEWORK_VERSION, - null, - categories, - TestSourceData.UNKNOWN, - null, - executionHistories.get(description)); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestStart( + new TestSuiteDescriptor(testSuiteName, null), + CucumberUtils.toTestDescriptor(description), + testName, + FRAMEWORK_NAME, + FRAMEWORK_VERSION, + null, + categories, + TestSourceData.UNKNOWN, + null, + executionHistories.get(description)); recordFeatureFileCodeCoverage(description); } @@ -100,8 +106,9 @@ private static void recordFeatureFileCodeCoverage(Description scenarioDescriptio public void testFinished(final Description description) { TestDescriptor testDescriptor = CucumberUtils.toTestDescriptor(description); TestExecutionHistory executionHistory = executionHistories.get(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFinish( - testDescriptor, null, executionHistory); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestFinish(testDescriptor, null, executionHistory); } // same callback is executed both for test cases and test suites (for setup/teardown errors) @@ -111,11 +118,15 @@ public void testFailure(final Failure failure) { if (isFeature(description)) { TestSuiteDescriptor suiteDescriptor = CucumberUtils.toSuiteDescriptor(description); Throwable throwable = failure.getException(); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFailure(suiteDescriptor, throwable); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestSuiteFailure(suiteDescriptor, throwable); } else { TestDescriptor testDescriptor = CucumberUtils.toTestDescriptor(description); Throwable throwable = failure.getException(); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFailure(testDescriptor, throwable); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestFailure(testDescriptor, throwable); } } @@ -132,10 +143,14 @@ public void testAssumptionFailure(final Failure failure) { Description description = failure.getDescription(); if (isFeature(description)) { TestSuiteDescriptor suiteDescriptor = CucumberUtils.toSuiteDescriptor(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteSkip(suiteDescriptor, reason); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestSuiteSkip(suiteDescriptor, reason); } else { TestDescriptor testDescriptor = CucumberUtils.toTestDescriptor(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSkip(testDescriptor, reason); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestSkip(testDescriptor, reason); } } @@ -147,32 +162,40 @@ public void testIgnored(final Description description) { if (isFeature(description)) { TestSuiteDescriptor suiteDescriptor = CucumberUtils.toSuiteDescriptor(description); String testSuiteName = CucumberUtils.getTestSuiteNameForFeature(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteStart( - suiteDescriptor, - testSuiteName, - FRAMEWORK_NAME, - FRAMEWORK_VERSION, - null, - Collections.emptyList(), - false, - TestFrameworkInstrumentation.CUCUMBER, - null); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteSkip(suiteDescriptor, reason); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFinish(suiteDescriptor, null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestSuiteStart( + suiteDescriptor, + testSuiteName, + FRAMEWORK_NAME, + FRAMEWORK_VERSION, + null, + Collections.emptyList(), + false, + TestFrameworkInstrumentation.CUCUMBER, + null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestSuiteSkip(suiteDescriptor, reason); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestSuiteFinish(suiteDescriptor, null); } else { String testSuiteName = CucumberUtils.getTestSuiteNameForScenario(description); String testName = CucumberUtils.getTestNameForScenario(description); List categories = getCategories(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestIgnore( - new TestSuiteDescriptor(testSuiteName, null), - CucumberUtils.toTestDescriptor(description), - testName, - FRAMEWORK_NAME, - FRAMEWORK_VERSION, - null, - categories, - TestSourceData.UNKNOWN, - reason); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .onTestIgnore( + new TestSuiteDescriptor(testSuiteName, null), + CucumberUtils.toTestDescriptor(description), + testName, + FRAMEWORK_NAME, + FRAMEWORK_VERSION, + null, + categories, + TestSourceData.UNKNOWN, + reason); } } diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberInstrumentation.java b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberInstrumentation.java index 5c9737b33a4..0ba9205314c 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberInstrumentation.java @@ -8,6 +8,7 @@ import datadog.trace.agent.tooling.InstrumenterModule; import datadog.trace.agent.tooling.muzzle.Reference; import datadog.trace.api.civisibility.execution.TestExecutionHistory; +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation; import datadog.trace.bootstrap.InstrumentationContext; import java.util.Collections; import java.util.List; @@ -82,6 +83,8 @@ public static void addTracingListener( } } + TestEventsHandlerHolder.start(TestFrameworkInstrumentation.CUCUMBER); + replacedNotifier.addListener( new CucumberTracingListener( InstrumentationContext.get(Description.class, TestExecutionHistory.class), children)); diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberSkipInstrumentation.java b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberSkipInstrumentation.java index 81c701b841f..cb54018c5c8 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberSkipInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberSkipInstrumentation.java @@ -12,6 +12,7 @@ import datadog.trace.api.civisibility.InstrumentationBridge; import datadog.trace.api.civisibility.config.TestIdentifier; import datadog.trace.api.civisibility.telemetry.tag.SkipReason; +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.cucumber.core.gherkin.Pickle; import java.util.List; @@ -83,7 +84,10 @@ public static Boolean run( @Advice.Argument(0) RunNotifier notifier) { TestIdentifier test = CucumberUtils.toTestIdentifier(description); - SkipReason skipReason = TestEventsHandlerHolder.TEST_EVENTS_HANDLER.skipReason(test); + SkipReason skipReason = + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.CUCUMBER) + .skipReason(test); if (skipReason == null) { return null; } diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/execution/Cucumber4ExecutionInstrumentation.java b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/execution/Cucumber4ExecutionInstrumentation.java index 7c169002193..71f35d5d6f7 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/execution/Cucumber4ExecutionInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/execution/Cucumber4ExecutionInstrumentation.java @@ -12,6 +12,7 @@ import datadog.trace.api.civisibility.config.TestSourceData; import datadog.trace.api.civisibility.execution.TestExecutionHistory; import datadog.trace.api.civisibility.execution.TestExecutionPolicy; +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation; import datadog.trace.bootstrap.InstrumentationContext; import datadog.trace.instrumentation.junit4.CucumberUtils; import datadog.trace.instrumentation.junit4.JUnit4Utils; @@ -97,8 +98,9 @@ public static Boolean execute( Description description = CucumberUtils.getPickleRunnerDescription(pickleRunner); TestIdentifier testIdentifier = CucumberUtils.toTestIdentifier(description); TestExecutionPolicy executionPolicy = - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.executionPolicy( - testIdentifier, TestSourceData.UNKNOWN); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT4) + .executionPolicy(testIdentifier, TestSourceData.UNKNOWN); if (!executionPolicy.applicable()) { // retries not applicable, run original method return null; diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy index c5dfbb68c22..1d16617beaf 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy @@ -1,6 +1,7 @@ import datadog.trace.api.DisableTestTrace import datadog.trace.api.civisibility.config.TestFQN import datadog.trace.api.civisibility.config.TestIdentifier +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation import datadog.trace.civisibility.CiVisibilityInstrumentationTest import datadog.trace.instrumentation.junit4.CucumberTracingListener import datadog.trace.instrumentation.junit4.TestEventsHandlerHolder @@ -211,7 +212,7 @@ class CucumberTest extends CiVisibilityInstrumentationTest { .map(f -> "classpath:" + f). collect(Collectors.joining(","))) - TestEventsHandlerHolder.start() + TestEventsHandlerHolder.start(TestFrameworkInstrumentation.CUCUMBER) try { def result = runner.run(TestSucceedCucumber) if (expectSuccess) { @@ -224,7 +225,7 @@ class CucumberTest extends CiVisibilityInstrumentationTest { } } } finally { - TestEventsHandlerHolder.stop() + TestEventsHandlerHolder.stop(TestFrameworkInstrumentation.CUCUMBER) } } diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/groovy/JUnit413Test.groovy b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/groovy/JUnit413Test.groovy index 9e2209f1b6c..0c65a799e7f 100644 --- a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/groovy/JUnit413Test.groovy +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/groovy/JUnit413Test.groovy @@ -1,4 +1,5 @@ import datadog.trace.api.DisableTestTrace +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation import datadog.trace.civisibility.CiVisibilityInstrumentationTest import datadog.trace.instrumentation.junit4.TestEventsHandlerHolder import junit.runner.Version @@ -37,7 +38,7 @@ class JUnit413Test extends CiVisibilityInstrumentationTest { } private void runTests(Collection> tests, boolean expectSuccess = true) { - TestEventsHandlerHolder.start() + TestEventsHandlerHolder.start(TestFrameworkInstrumentation.JUNIT4) try { Class[] array = tests.toArray(new Class[0]) def result = runner.run(array) diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitInstrumentation.java b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitInstrumentation.java index 04a7b05b9ba..9fe051f3c56 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitInstrumentation.java @@ -7,6 +7,7 @@ import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; import datadog.trace.api.civisibility.execution.TestExecutionHistory; +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation; import datadog.trace.bootstrap.InstrumentationContext; import java.util.Collections; import java.util.List; @@ -73,6 +74,8 @@ public static void addTracingListener( } } + TestEventsHandlerHolder.start(TestFrameworkInstrumentation.MUNIT); + replacedNotifier.addListener( new MUnitTracingListener( InstrumentationContext.get(Description.class, TestExecutionHistory.class))); diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitTracingListener.java b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitTracingListener.java index 56814b0a8b2..43194f1eee2 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitTracingListener.java +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitTracingListener.java @@ -46,16 +46,18 @@ public void testSuiteStarted(final Description description) { Class testClass = description.getTestClass(); String testSuiteName = description.getClassName(); List categories = getCategories(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteStart( - suiteDescriptor, - testSuiteName, - FRAMEWORK_NAME, - FRAMEWORK_VERSION, - testClass, - categories, - false, - TestFrameworkInstrumentation.MUNIT, - null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.MUNIT) + .onTestSuiteStart( + suiteDescriptor, + testSuiteName, + FRAMEWORK_NAME, + FRAMEWORK_VERSION, + testClass, + categories, + false, + TestFrameworkInstrumentation.MUNIT, + null); } public void testSuiteFinished(final Description description) { @@ -67,7 +69,9 @@ public void testSuiteFinished(final Description description) { } TestSuiteDescriptor suiteDescriptor = MUnitUtils.toSuiteDescriptor(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFinish(suiteDescriptor, null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.MUNIT) + .onTestSuiteFinish(suiteDescriptor, null); } @Override @@ -76,25 +80,28 @@ public void testStarted(final Description description) { TestDescriptor testDescriptor = MUnitUtils.toTestDescriptor(description); String testName = description.getMethodName(); List categories = getCategories(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestStart( - suiteDescriptor, - testDescriptor, - testName, - FRAMEWORK_NAME, - FRAMEWORK_VERSION, - null, - categories, - JUnit4Utils.toTestSourceData(description), - null, - executionHistories.get(description)); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.MUNIT) + .onTestStart( + suiteDescriptor, + testDescriptor, + testName, + FRAMEWORK_NAME, + FRAMEWORK_VERSION, + null, + categories, + JUnit4Utils.toTestSourceData(description), + null, + executionHistories.get(description)); } @Override public void testFinished(final Description description) { TestDescriptor testDescriptor = MUnitUtils.toTestDescriptor(description); TestExecutionHistory executionHistory = executionHistories.get(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFinish( - testDescriptor, null, executionHistory); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.MUNIT) + .onTestFinish(testDescriptor, null, executionHistory); } // same callback is executed both for test cases and test suites (for setup/teardown errors) @@ -106,10 +113,14 @@ public void testFailure(final Failure failure) { String testName = description.getMethodName(); if (Strings.isNotBlank(testName)) { TestDescriptor testDescriptor = MUnitUtils.toTestDescriptor(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFailure(testDescriptor, throwable); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.MUNIT) + .onTestFailure(testDescriptor, throwable); } else { TestSuiteDescriptor suiteDescriptor = MUnitUtils.toSuiteDescriptor(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFailure(suiteDescriptor, throwable); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.MUNIT) + .onTestSuiteFailure(suiteDescriptor, throwable); } } @@ -129,11 +140,15 @@ public void testAssumptionFailure(final Failure failure) { if (Strings.isNotBlank(testName)) { TestDescriptor testDescriptor = MUnitUtils.toTestDescriptor(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSkip(testDescriptor, reason); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.MUNIT) + .onTestSkip(testDescriptor, reason); } else if (testClass != null) { TestSuiteDescriptor suiteDescriptor = MUnitUtils.toSuiteDescriptor(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteSkip(suiteDescriptor, reason); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.MUNIT) + .onTestSuiteSkip(suiteDescriptor, reason); for (Description child : description.getChildren()) { testCaseIgnored(child); } @@ -152,20 +167,26 @@ public void testIgnored(final Description description) { // while newer versions don't TestSuiteDescriptor suiteDescriptor = MUnitUtils.toSuiteDescriptor(description); List categories = getCategories(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestStart( - suiteDescriptor, - testDescriptor, - testName, - FRAMEWORK_NAME, - FRAMEWORK_VERSION, - null, - categories, - JUnit4Utils.toTestSourceData(description), - null, - null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.MUNIT) + .onTestStart( + suiteDescriptor, + testDescriptor, + testName, + FRAMEWORK_NAME, + FRAMEWORK_VERSION, + null, + categories, + JUnit4Utils.toTestSourceData(description), + null, + null); } - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSkip(testDescriptor, null); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFinish(testDescriptor, null, null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.MUNIT) + .onTestSkip(testDescriptor, null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.MUNIT) + .onTestFinish(testDescriptor, null, null); } else if (testClass != null) { TestSuiteDescriptor suiteDescriptor = MUnitUtils.toSuiteDescriptor(description); @@ -175,25 +196,31 @@ public void testIgnored(final Description description) { // there is a bug in MUnit 1.0.1+: start/finish events are not fired for skipped suites String testSuiteName = description.getClassName(); List categories = getCategories(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteStart( - suiteDescriptor, - testSuiteName, - FRAMEWORK_NAME, - FRAMEWORK_VERSION, - testClass, - categories, - false, - TestFrameworkInstrumentation.MUNIT, - null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.MUNIT) + .onTestSuiteStart( + suiteDescriptor, + testSuiteName, + FRAMEWORK_NAME, + FRAMEWORK_VERSION, + testClass, + categories, + false, + TestFrameworkInstrumentation.MUNIT, + null); } - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteSkip(suiteDescriptor, null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.MUNIT) + .onTestSuiteSkip(suiteDescriptor, null); for (Description child : description.getChildren()) { testCaseIgnored(child); } if (!suiteStarted) { - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFinish(suiteDescriptor, null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.MUNIT) + .onTestSuiteFinish(suiteDescriptor, null); } } } @@ -213,16 +240,18 @@ private void testCaseIgnored(final Description description) { TestDescriptor testDescriptor = MUnitUtils.toTestDescriptor(description); String testName = description.getMethodName(); List categories = getCategories(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestIgnore( - suiteDescriptor, - testDescriptor, - testName, - FRAMEWORK_NAME, - FRAMEWORK_VERSION, - null, - categories, - JUnit4Utils.toTestSourceData(description), - null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.MUNIT) + .onTestIgnore( + suiteDescriptor, + testDescriptor, + testName, + FRAMEWORK_NAME, + FRAMEWORK_VERSION, + null, + categories, + JUnit4Utils.toTestSourceData(description), + null); } private static boolean isSuiteContainingChildren(final Description description) { diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/execution/MUnitExecutionInstrumentation.java b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/execution/MUnitExecutionInstrumentation.java index 0126950be92..de6288d8fb8 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/execution/MUnitExecutionInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/execution/MUnitExecutionInstrumentation.java @@ -11,6 +11,7 @@ import datadog.trace.api.civisibility.config.TestSourceData; import datadog.trace.api.civisibility.execution.TestExecutionHistory; import datadog.trace.api.civisibility.execution.TestExecutionPolicy; +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation; import datadog.trace.bootstrap.InstrumentationContext; import datadog.trace.instrumentation.junit4.JUnit4Utils; import datadog.trace.instrumentation.junit4.MUnitUtils; @@ -91,8 +92,9 @@ public static Future apply( TestSourceData testSourceData = JUnit4Utils.toTestSourceData(description); TestExecutionPolicy executionPolicy = - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.executionPolicy( - testIdentifier, testSourceData); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.MUNIT) + .executionPolicy(testIdentifier, testSourceData); if (!executionPolicy.applicable()) { // retries not applicable, run original method return null; diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy index 4c47ac7bca3..19eb74ae243 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy @@ -1,5 +1,6 @@ import datadog.trace.api.DisableTestTrace import datadog.trace.api.civisibility.config.TestFQN +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation import datadog.trace.civisibility.CiVisibilityInstrumentationTest import datadog.trace.civisibility.diff.FileDiff import datadog.trace.civisibility.diff.LineDiff @@ -144,7 +145,7 @@ class MUnitTest extends CiVisibilityInstrumentationTest { } private void runTests(Collection> tests, boolean expectSuccess = true) { - TestEventsHandlerHolder.start() + TestEventsHandlerHolder.start(TestFrameworkInstrumentation.MUNIT) try { Class[] array = tests.toArray(new Class[0]) def result = runner.run(array) @@ -158,7 +159,7 @@ class MUnitTest extends CiVisibilityInstrumentationTest { } } } finally { - TestEventsHandlerHolder.stop() + TestEventsHandlerHolder.stop(TestFrameworkInstrumentation.MUNIT) } } diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java index abd72ed85b9..99c07805562 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java +++ b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java @@ -10,6 +10,7 @@ import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; import datadog.trace.api.civisibility.execution.TestExecutionHistory; +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation; import datadog.trace.bootstrap.InstrumentationContext; import java.util.Collections; import java.util.List; @@ -114,6 +115,8 @@ public static void addTracingListener( } } + TestEventsHandlerHolder.start(TestFrameworkInstrumentation.JUNIT4); + final TracingListener tracingListener = new JUnit4TracingListener( InstrumentationContext.get(Description.class, TestExecutionHistory.class)); diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SkipInstrumentation.java b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SkipInstrumentation.java index 560c99f2a3f..c0dddc72226 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SkipInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4SkipInstrumentation.java @@ -13,6 +13,7 @@ import datadog.trace.api.civisibility.InstrumentationBridge; import datadog.trace.api.civisibility.config.TestIdentifier; import datadog.trace.api.civisibility.telemetry.tag.SkipReason; +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.lang.reflect.Method; import java.util.List; @@ -93,7 +94,10 @@ public static Boolean runChild( } TestIdentifier test = JUnit4Utils.toTestIdentifier(description); - SkipReason skipReason = TestEventsHandlerHolder.TEST_EVENTS_HANDLER.skipReason(test); + SkipReason skipReason = + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT4) + .skipReason(test); if (skipReason == null) { return null; } diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4TracingListener.java b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4TracingListener.java index db57d2af4f1..90a04b81fdc 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4TracingListener.java +++ b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4TracingListener.java @@ -36,16 +36,18 @@ public void testSuiteStarted(final Description description) { Class testClass = description.getTestClass(); String testSuiteName = JUnit4Utils.getSuiteName(testClass, description); List categories = JUnit4Utils.getCategories(testClass, null); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteStart( - suiteDescriptor, - testSuiteName, - FRAMEWORK_NAME, - FRAMEWORK_VERSION, - testClass, - categories, - false, - TestFrameworkInstrumentation.JUNIT4, - null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT4) + .onTestSuiteStart( + suiteDescriptor, + testSuiteName, + FRAMEWORK_NAME, + FRAMEWORK_VERSION, + testClass, + categories, + false, + TestFrameworkInstrumentation.JUNIT4, + null); } public void testSuiteFinished(final Description description) { @@ -57,7 +59,9 @@ public void testSuiteFinished(final Description description) { } TestSuiteDescriptor suiteDescriptor = JUnit4Utils.toSuiteDescriptor(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFinish(suiteDescriptor, null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT4) + .onTestSuiteFinish(suiteDescriptor, null); } @Override @@ -75,17 +79,19 @@ public void testStarted(final Description description) { List categories = JUnit4Utils.getCategories(testSourceData.getTestClass(), testSourceData.getTestMethod()); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestStart( - suiteDescriptor, - testDescriptor, - testName, - FRAMEWORK_NAME, - FRAMEWORK_VERSION, - testParameters, - categories, - testSourceData, - null, - executionHistories.get(description)); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT4) + .onTestStart( + suiteDescriptor, + testDescriptor, + testName, + FRAMEWORK_NAME, + FRAMEWORK_VERSION, + testParameters, + categories, + testSourceData, + null, + executionHistories.get(description)); } @Override @@ -96,8 +102,9 @@ public void testFinished(final Description description) { TestDescriptor testDescriptor = JUnit4Utils.toTestDescriptor(description); TestExecutionHistory executionHistory = executionHistories.get(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFinish( - testDescriptor, null, executionHistory); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT4) + .onTestFinish(testDescriptor, null, executionHistory); } // same callback is executed both for test cases and test suites (for setup/teardown errors) @@ -111,11 +118,15 @@ public void testFailure(final Failure failure) { if (JUnit4Utils.isTestSuiteDescription(description)) { TestSuiteDescriptor suiteDescriptor = JUnit4Utils.toSuiteDescriptor(description); Throwable throwable = failure.getException(); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFailure(suiteDescriptor, throwable); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT4) + .onTestSuiteFailure(suiteDescriptor, throwable); } else { TestDescriptor testDescriptor = JUnit4Utils.toTestDescriptor(description); Throwable throwable = failure.getException(); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestFailure(testDescriptor, throwable); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT4) + .onTestFailure(testDescriptor, throwable); } } @@ -136,7 +147,9 @@ public void testAssumptionFailure(final Failure failure) { if (JUnit4Utils.isTestSuiteDescription(description)) { TestSuiteDescriptor suiteDescriptor = JUnit4Utils.toSuiteDescriptor(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteSkip(suiteDescriptor, reason); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT4) + .onTestSuiteSkip(suiteDescriptor, reason); List testMethods = JUnit4Utils.getTestMethods(description.getTestClass()); for (Method testMethod : testMethods) { @@ -144,7 +157,9 @@ public void testAssumptionFailure(final Failure failure) { } } else { TestDescriptor testDescriptor = JUnit4Utils.toTestDescriptor(description); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSkip(testDescriptor, reason); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT4) + .onTestSkip(testDescriptor, reason); } } @@ -168,24 +183,30 @@ public void testIgnored(final Description description) { String testSuiteName = JUnit4Utils.getSuiteName(testClass, description); List categories = JUnit4Utils.getCategories(testClass, null); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteStart( - suiteDescriptor, - testSuiteName, - FRAMEWORK_NAME, - FRAMEWORK_VERSION, - testClass, - categories, - false, - TestFrameworkInstrumentation.JUNIT4, - null); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteSkip(suiteDescriptor, reason); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT4) + .onTestSuiteStart( + suiteDescriptor, + testSuiteName, + FRAMEWORK_NAME, + FRAMEWORK_VERSION, + testClass, + categories, + false, + TestFrameworkInstrumentation.JUNIT4, + null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT4) + .onTestSuiteSkip(suiteDescriptor, reason); List testMethods = JUnit4Utils.getTestMethods(testClass); for (Method testMethod : testMethods) { testIgnored(description, testMethod, reason); } - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestSuiteFinish(suiteDescriptor, null); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT4) + .onTestSuiteFinish(suiteDescriptor, null); } } @@ -204,15 +225,17 @@ private void testIgnored(Description description, Method testMethod, String reas String testName = JUnit4Utils.getTestName(description, testMethod); String testParameters = JUnit4Utils.getParameters(description); List categories = JUnit4Utils.getCategories(testClass, testMethod); - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.onTestIgnore( - suiteDescriptor, - testDescriptor, - testName, - FRAMEWORK_NAME, - FRAMEWORK_VERSION, - testParameters, - categories, - testSourceData, - reason); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT4) + .onTestIgnore( + suiteDescriptor, + testDescriptor, + testName, + FRAMEWORK_NAME, + FRAMEWORK_VERSION, + testParameters, + categories, + testSourceData, + reason); } } diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TestEventsHandlerHolder.java b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TestEventsHandlerHolder.java index 699812f473d..7e5d73ff5df 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TestEventsHandlerHolder.java +++ b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TestEventsHandlerHolder.java @@ -4,14 +4,19 @@ import datadog.trace.api.civisibility.events.TestDescriptor; import datadog.trace.api.civisibility.events.TestEventsHandler; import datadog.trace.api.civisibility.events.TestSuiteDescriptor; +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation; import datadog.trace.util.AgentThreadFactory; +import java.util.HashMap; +import java.util.Map; public abstract class TestEventsHandlerHolder { - public static volatile TestEventsHandler TEST_EVENTS_HANDLER; + // store one handler per framework running + public static Map< + TestFrameworkInstrumentation, TestEventsHandler> + HANDLERS = new HashMap<>(); static { - start(); Runtime.getRuntime() .addShutdownHook( AgentThreadFactory.newAgentThread( @@ -20,14 +25,24 @@ public abstract class TestEventsHandlerHolder { false)); } - public static void start() { - TEST_EVENTS_HANDLER = InstrumentationBridge.createTestEventsHandler("junit", null, null); + public static void start(TestFrameworkInstrumentation framework) { + HANDLERS.put(framework, InstrumentationBridge.createTestEventsHandler("junit", null, null)); } public static void stop() { - if (TEST_EVENTS_HANDLER != null) { - TEST_EVENTS_HANDLER.close(); - TEST_EVENTS_HANDLER = null; + for (Map.Entry< + TestFrameworkInstrumentation, TestEventsHandler> + entry : HANDLERS.entrySet()) { + entry.getValue().close(); + } + HANDLERS.clear(); + } + + public static void stop(TestFrameworkInstrumentation framework) { + TestEventsHandler handler = HANDLERS.get(framework); + if (handler != null) { + handler.close(); + HANDLERS.remove(framework); } } diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/execution/JUnit4ExecutionInstrumentation.java b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/execution/JUnit4ExecutionInstrumentation.java index ad25f41a9f5..18d74ada2bc 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/execution/JUnit4ExecutionInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/execution/JUnit4ExecutionInstrumentation.java @@ -12,6 +12,7 @@ import datadog.trace.api.civisibility.config.TestSourceData; import datadog.trace.api.civisibility.execution.TestExecutionHistory; import datadog.trace.api.civisibility.execution.TestExecutionPolicy; +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation; import datadog.trace.bootstrap.InstrumentationContext; import datadog.trace.instrumentation.junit4.JUnit4Utils; import datadog.trace.instrumentation.junit4.TestEventsHandlerHolder; @@ -62,6 +63,7 @@ public String[] helperClassNames() { parentPackageName + ".SkippedByDatadog", parentPackageName + ".JUnit4Utils", parentPackageName + ".TracingListener", + parentPackageName + ".JUnit4Framework", parentPackageName + ".TestEventsHandlerHolder", packageName + ".FailureSuppressingNotifier" }; @@ -101,8 +103,9 @@ public static Boolean apply( TestIdentifier testIdentifier = JUnit4Utils.toTestIdentifier(description); TestSourceData testSourceData = JUnit4Utils.toTestSourceData(description); TestExecutionPolicy executionPolicy = - TestEventsHandlerHolder.TEST_EVENTS_HANDLER.executionPolicy( - testIdentifier, testSourceData); + TestEventsHandlerHolder.HANDLERS + .get(TestFrameworkInstrumentation.JUNIT4) + .executionPolicy(testIdentifier, testSourceData); if (!executionPolicy.applicable()) { // retries not applicable, run original method return null; diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy b/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy index 858525cf44a..e38fd70d1eb 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy @@ -1,6 +1,7 @@ import datadog.trace.api.DisableTestTrace import datadog.trace.api.civisibility.config.TestFQN import datadog.trace.api.civisibility.config.TestIdentifier +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation import datadog.trace.civisibility.CiVisibilityInstrumentationTest import datadog.trace.civisibility.diff.FileDiff import datadog.trace.civisibility.diff.LineDiff @@ -206,7 +207,7 @@ class JUnit4Test extends CiVisibilityInstrumentationTest { } private void runTests(Collection> tests, boolean expectSuccess = true) { - TestEventsHandlerHolder.start() + TestEventsHandlerHolder.start(TestFrameworkInstrumentation.JUNIT4) try { Class[] array = tests.toArray(new Class[0]) def result = runner.run(array) From 45735e66be7670013b4e1856db2305f2f9a82937 Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Wed, 26 Feb 2025 09:50:51 +0100 Subject: [PATCH 04/41] junit4 instrumentation fixes --- .../junit4/execution/Cucumber4ExecutionInstrumentation.java | 2 +- .../junit-4.10/junit-4.13/src/test/groovy/JUnit413Test.groovy | 2 +- .../junit4/execution/JUnit4ExecutionInstrumentation.java | 1 - .../junit-4.10/src/test/groovy/JUnit4Test.groovy | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/execution/Cucumber4ExecutionInstrumentation.java b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/execution/Cucumber4ExecutionInstrumentation.java index 71f35d5d6f7..11bd3ec9040 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/execution/Cucumber4ExecutionInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/execution/Cucumber4ExecutionInstrumentation.java @@ -99,7 +99,7 @@ public static Boolean execute( TestIdentifier testIdentifier = CucumberUtils.toTestIdentifier(description); TestExecutionPolicy executionPolicy = TestEventsHandlerHolder.HANDLERS - .get(TestFrameworkInstrumentation.JUNIT4) + .get(TestFrameworkInstrumentation.CUCUMBER) .executionPolicy(testIdentifier, TestSourceData.UNKNOWN); if (!executionPolicy.applicable()) { // retries not applicable, run original method diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/groovy/JUnit413Test.groovy b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/groovy/JUnit413Test.groovy index 0c65a799e7f..5f400d721ff 100644 --- a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/groovy/JUnit413Test.groovy +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/groovy/JUnit413Test.groovy @@ -52,7 +52,7 @@ class JUnit413Test extends CiVisibilityInstrumentationTest { } } } finally { - TestEventsHandlerHolder.stop() + TestEventsHandlerHolder.stop(TestFrameworkInstrumentation.JUNIT4) } } diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/execution/JUnit4ExecutionInstrumentation.java b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/execution/JUnit4ExecutionInstrumentation.java index 18d74ada2bc..2ea225acd7e 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/execution/JUnit4ExecutionInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/execution/JUnit4ExecutionInstrumentation.java @@ -63,7 +63,6 @@ public String[] helperClassNames() { parentPackageName + ".SkippedByDatadog", parentPackageName + ".JUnit4Utils", parentPackageName + ".TracingListener", - parentPackageName + ".JUnit4Framework", parentPackageName + ".TestEventsHandlerHolder", packageName + ".FailureSuppressingNotifier" }; diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy b/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy index e38fd70d1eb..95b107ac860 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy @@ -221,7 +221,7 @@ class JUnit4Test extends CiVisibilityInstrumentationTest { } } } finally { - TestEventsHandlerHolder.stop() + TestEventsHandlerHolder.stop(TestFrameworkInstrumentation.JUNIT4) } } From ee63fa77801815e6fc24a5187c41164e94b6bde9 Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Wed, 26 Feb 2025 10:08:01 +0100 Subject: [PATCH 05/41] fix muzzle checks for junit5 instrumentation --- .../junit5/order/JUnit5TestOrderInstrumentation.java | 1 - .../junit5/execution/JUnit5ExecutionStoreInstrumentation.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/JUnit5TestOrderInstrumentation.java b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/JUnit5TestOrderInstrumentation.java index c1a409d4b49..2e5686f5fc7 100644 --- a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/JUnit5TestOrderInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/order/JUnit5TestOrderInstrumentation.java @@ -52,7 +52,6 @@ public ElementMatcher hierarchyMatcher() { @Override public String[] helperClassNames() { return new String[] { - parentPackageName + ".JUnit5Framework", parentPackageName + ".JUnitPlatformUtils", parentPackageName + ".TestEventsHandlerHolder", packageName + ".JUnit5OrderUtils", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionStoreInstrumentation.java b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionStoreInstrumentation.java index 99d7e294b7c..019b4a6b4dd 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionStoreInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionStoreInstrumentation.java @@ -51,7 +51,7 @@ public ElementMatcher hierarchyMatcher() { @Override public String[] helperClassNames() { return new String[] { - parentPackageName + ".TestEventsHandlerHolder", + parentPackageName + ".JUnitPlatformUtils", parentPackageName + ".TestEventsHandlerHolder", }; } From 8ec555d2bb694d2317bd49297a338ad1129c9f2e Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Wed, 26 Feb 2025 10:47:40 +0100 Subject: [PATCH 06/41] fix double close of default handler in junit5 instrumentation --- .../trace/instrumentation/junit5/TestEventsHandlerHolder.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java index af432bf5395..2366d501af4 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java +++ b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java @@ -92,6 +92,9 @@ public static synchronized void stop() { for (Map.Entry> entry : HANDLERS.entrySet()) { entry.getValue().close(); + if (entry.getValue().equals(DEFAULT_HANDLER)) { + DEFAULT_HANDLER = null; + } } HANDLERS.clear(); if (DEFAULT_HANDLER != null) { From 04a80849126cf0085cf28b9cfd64153a4ad0f4e1 Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Wed, 26 Feb 2025 20:29:24 +0100 Subject: [PATCH 07/41] pr fixes --- .../junit4/TestEventsHandlerHolder.java | 26 +-- .../instrumentation/junit5/CucumberUtils.java | 4 +- .../src/test/groovy/CucumberTest.groovy | 4 - .../src/test/groovy/JUnit58Test.groovy | 2 - .../instrumentation/junit5/SpockUtils.java | 5 +- .../src/test/groovy/SpockTest.groovy | 4 - .../junit5/JUnit5Instrumentation.java | 5 +- .../junit5/JUnitPlatformUtils.java | 27 +++ .../junit5/TestEventsHandlerHolder.java | 54 ++--- .../JUnit5ExecutionInstrumentation.java | 17 +- .../src/test/groovy/JUnit5Test.groovy | 3 - internal-api/build.gradle | 1 + .../datadog/trace/util/ConcurrentEnumMap.java | 187 ++++++++++++++++++ 13 files changed, 261 insertions(+), 78 deletions(-) create mode 100644 internal-api/src/main/java/datadog/trace/util/ConcurrentEnumMap.java diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TestEventsHandlerHolder.java b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TestEventsHandlerHolder.java index 7e5d73ff5df..682e982d7ae 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TestEventsHandlerHolder.java +++ b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TestEventsHandlerHolder.java @@ -6,15 +6,15 @@ import datadog.trace.api.civisibility.events.TestSuiteDescriptor; import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation; import datadog.trace.util.AgentThreadFactory; -import java.util.HashMap; +import datadog.trace.util.ConcurrentEnumMap; import java.util.Map; public abstract class TestEventsHandlerHolder { // store one handler per framework running - public static Map< + public static final Map< TestFrameworkInstrumentation, TestEventsHandler> - HANDLERS = new HashMap<>(); + HANDLERS = new ConcurrentEnumMap<>(TestFrameworkInstrumentation.class); static { Runtime.getRuntime() @@ -25,24 +25,24 @@ public abstract class TestEventsHandlerHolder { false)); } - public static void start(TestFrameworkInstrumentation framework) { - HANDLERS.put(framework, InstrumentationBridge.createTestEventsHandler("junit", null, null)); + public static synchronized void start(TestFrameworkInstrumentation framework) { + TestEventsHandler handler = HANDLERS.get(framework); + if (handler == null) { + HANDLERS.put(framework, InstrumentationBridge.createTestEventsHandler("junit", null, null)); + } } - public static void stop() { - for (Map.Entry< - TestFrameworkInstrumentation, TestEventsHandler> - entry : HANDLERS.entrySet()) { - entry.getValue().close(); + public static synchronized void stop() { + for (TestEventsHandler handler : HANDLERS.values()) { + handler.close(); } HANDLERS.clear(); } - public static void stop(TestFrameworkInstrumentation framework) { - TestEventsHandler handler = HANDLERS.get(framework); + public static synchronized void stop(TestFrameworkInstrumentation framework) { + TestEventsHandler handler = HANDLERS.remove(framework); if (handler != null) { handler.close(); - HANDLERS.remove(framework); } } diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/CucumberUtils.java b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/CucumberUtils.java index 1e04e935a1f..1be7ac3effc 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/CucumberUtils.java +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/main/java/datadog/trace/instrumentation/junit5/CucumberUtils.java @@ -21,7 +21,9 @@ public abstract class CucumberUtils { static { TestDataFactory.register( - "cucumber", CucumberUtils::toTestIdentifier, d -> TestSourceData.UNKNOWN); + JUnitPlatformUtils.ENGINE_ID_CUCUMBER, + CucumberUtils::toTestIdentifier, + d -> TestSourceData.UNKNOWN); } public static @Nullable String getCucumberVersion(TestEngine cucumberEngine) { diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy index c2735c0e590..d28a995025d 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy @@ -1,9 +1,7 @@ import datadog.trace.api.DisableTestTrace import datadog.trace.api.civisibility.config.TestFQN import datadog.trace.api.civisibility.config.TestIdentifier -import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation import datadog.trace.civisibility.CiVisibilityInstrumentationTest - import datadog.trace.instrumentation.junit5.TestEventsHandlerHolder import io.cucumber.core.api.TypeRegistry import io.cucumber.core.options.Constants @@ -223,8 +221,6 @@ class CucumberTest extends CiVisibilityInstrumentationTest { } protected void runFeatures(List classpathFeatures, boolean parallel, boolean expectSuccess = true) { - TestEventsHandlerHolder.startForcefully(TestFrameworkInstrumentation.CUCUMBER) - DiscoverySelector[] selectors = new DiscoverySelector[classpathFeatures.size()] for (i in 0..> tests, boolean expectSuccess = true) { - TestEventsHandlerHolder.startForcefully(TestFrameworkInstrumentation.JUNIT5) - DiscoverySelector[] selectors = new DiscoverySelector[tests.size()] for (i in 0..> classes, boolean expectSuccess = true) { - TestEventsHandlerHolder.startForcefully(TestFrameworkInstrumentation.SPOCK) - DiscoverySelector[] selectors = new DiscoverySelector[classes.size()] for (i in 0.. contextStore = InstrumentationContext.get(TestDescriptor.class, Object.class); - TestEventsHandlerHolder.setContextStores( - (ContextStore) contextStore, (ContextStore) contextStore); - TestEventsHandlerHolder.start(testEngine); + TestEventsHandlerHolder.start( + testEngine, (ContextStore) contextStore, (ContextStore) contextStore); } } diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java index 0c212bce5ad..3c81cb3f45d 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java +++ b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java @@ -13,6 +13,7 @@ import java.lang.invoke.MethodHandle; import java.lang.reflect.Method; import java.util.List; +import java.util.ListIterator; import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.junit.platform.commons.JUnitException; @@ -40,6 +41,9 @@ public abstract class JUnitPlatformUtils { private static final Logger LOGGER = LoggerFactory.getLogger(JUnitPlatformUtils.class); + public static final String ENGINE_ID_CUCUMBER = "cucumber"; + public static final String ENGINE_ID_SPOCK = "spock"; + private JUnitPlatformUtils() {} private static final MethodHandles METHOD_HANDLES = @@ -218,4 +222,27 @@ public static TestFrameworkInstrumentation engineToFramework(TestEngine testEngi return TestFrameworkInstrumentation.JUNIT5; } } + + public static String getEngineId(TestDescriptor testDescriptor) { + UniqueId uniqueId = testDescriptor.getUniqueId(); + List segments = uniqueId.getSegments(); + ListIterator it = segments.listIterator(segments.size()); + while (it.hasPrevious()) { + UniqueId.Segment segment = it.previous(); + if ("engine".equals(segment.getType())) { + return segment.getValue(); + } + } + return null; + } + + public static TestFrameworkInstrumentation engineIdToFramework(String engineId) { + if (ENGINE_ID_CUCUMBER.equals(engineId)) { + return TestFrameworkInstrumentation.CUCUMBER; + } else if (ENGINE_ID_SPOCK.equals(engineId)) { + return TestFrameworkInstrumentation.SPOCK; + } else { + return TestFrameworkInstrumentation.JUNIT5; + } + } } diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java index 2366d501af4..70432217a1c 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java +++ b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java @@ -8,7 +8,7 @@ import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation; import datadog.trace.bootstrap.ContextStore; import datadog.trace.util.AgentThreadFactory; -import java.util.HashMap; +import datadog.trace.util.ConcurrentEnumMap; import java.util.Map; import org.junit.platform.engine.TestDescriptor; import org.junit.platform.engine.TestEngine; @@ -16,11 +16,10 @@ public abstract class TestEventsHandlerHolder { // store one handler per framework running - public static Map> - HANDLERS = new HashMap<>(); - public static volatile TestEventsHandler DEFAULT_HANDLER; - private static ContextStore SUITE_STORE; - private static ContextStore TEST_STORE; + public static final Map< + TestFrameworkInstrumentation, TestEventsHandler> + HANDLERS = new ConcurrentEnumMap<>(TestFrameworkInstrumentation.class); + private static volatile ContextStore EXECUTION_HISTORY_STORE; @@ -33,17 +32,6 @@ public abstract class TestEventsHandlerHolder { false)); } - public static synchronized void setContextStores( - ContextStore suiteStore, - ContextStore testStore) { - if (SUITE_STORE == null) { - SUITE_STORE = suiteStore; - } - if (TEST_STORE == null) { - TEST_STORE = testStore; - } - } - public static synchronized void setExecutionHistoryStore( ContextStore executionHistoryStore) { if (EXECUTION_HISTORY_STORE == null) { @@ -66,41 +54,23 @@ public static TestExecutionHistory getExecutionHistory(TestDescriptor testDescri } } - public static synchronized void start(TestEngine testEngine) { + public static synchronized void start( + TestEngine testEngine, + ContextStore suiteStore, + ContextStore testStore) { TestFrameworkInstrumentation framework = JUnitPlatformUtils.engineToFramework(testEngine); TestEventsHandler handler = HANDLERS.get(framework); if (handler == null) { - handler = InstrumentationBridge.createTestEventsHandler("junit", SUITE_STORE, TEST_STORE); + handler = InstrumentationBridge.createTestEventsHandler("junit", suiteStore, testStore); HANDLERS.put(framework, handler); - if (DEFAULT_HANDLER == null) { - DEFAULT_HANDLER = handler; - } - } - } - - // used by instrumentation tests - public static synchronized void startForcefully(TestFrameworkInstrumentation framework) { - if (SUITE_STORE != null && TEST_STORE != null) { - TestEventsHandler handler = - InstrumentationBridge.createTestEventsHandler("junit", SUITE_STORE, TEST_STORE); - HANDLERS.put(framework, handler); - DEFAULT_HANDLER = handler; } } public static synchronized void stop() { - for (Map.Entry> - entry : HANDLERS.entrySet()) { - entry.getValue().close(); - if (entry.getValue().equals(DEFAULT_HANDLER)) { - DEFAULT_HANDLER = null; - } + for (TestEventsHandler handler : HANDLERS.values()) { + handler.close(); } HANDLERS.clear(); - if (DEFAULT_HANDLER != null) { - DEFAULT_HANDLER.close(); - DEFAULT_HANDLER = null; - } } private TestEventsHandlerHolder() {} diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionInstrumentation.java b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionInstrumentation.java index ebf90a7f27c..21aa292daac 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/execution/JUnit5ExecutionInstrumentation.java @@ -14,6 +14,7 @@ import datadog.trace.api.civisibility.config.TestIdentifier; import datadog.trace.api.civisibility.config.TestSourceData; import datadog.trace.api.civisibility.execution.TestExecutionPolicy; +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation; import datadog.trace.bootstrap.CallDepthThreadLocalMap; import datadog.trace.instrumentation.junit5.JUnitPlatformUtils; import datadog.trace.instrumentation.junit5.TestDataFactory; @@ -112,10 +113,6 @@ public static class ExecutionAdvice { @SuppressFBWarnings("NP_BOOLEAN_RETURN_NULL") @Advice.OnMethodEnter(skipOn = Boolean.class) public static Boolean execute(@Advice.This HierarchicalTestExecutorService.TestTask testTask) { - if (TestEventsHandlerHolder.DEFAULT_HANDLER == null) { - // is possible when running tracer's instrumentation tests - return null; - } if (CallDepthThreadLocalMap.getCallDepth(HierarchicalTestExecutorService.TestTask.class) != 0) { @@ -135,10 +132,20 @@ public static Boolean execute(@Advice.This HierarchicalTestExecutorService.TestT return null; } + String engineId = JUnitPlatformUtils.getEngineId(testDescriptor); + TestFrameworkInstrumentation framework = JUnitPlatformUtils.engineIdToFramework(engineId); + + if (TestEventsHandlerHolder.HANDLERS.get(framework) == null) { + // is possible when running tracer's instrumentation tests + return null; + } + TestIdentifier testIdentifier = TestDataFactory.createTestIdentifier(testDescriptor); TestSourceData testSource = TestDataFactory.createTestSourceData(testDescriptor); TestExecutionPolicy executionPolicy = - TestEventsHandlerHolder.DEFAULT_HANDLER.executionPolicy(testIdentifier, testSource); + TestEventsHandlerHolder.HANDLERS + .get(framework) + .executionPolicy(testIdentifier, testSource); if (!executionPolicy.applicable()) { return null; } diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy b/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy index 861baf0c2e6..655cf3b2367 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy @@ -1,7 +1,6 @@ import datadog.trace.api.DisableTestTrace import datadog.trace.api.civisibility.config.TestFQN import datadog.trace.api.civisibility.config.TestIdentifier -import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation import datadog.trace.civisibility.CiVisibilityInstrumentationTest import datadog.trace.civisibility.diff.FileDiff import datadog.trace.civisibility.diff.LineDiff @@ -245,8 +244,6 @@ class JUnit5Test extends CiVisibilityInstrumentationTest { } protected void runTests(List> tests, boolean expectSuccess = true) { - TestEventsHandlerHolder.startForcefully(TestFrameworkInstrumentation.JUNIT5) - DiscoverySelector[] selectors = new DiscoverySelector[tests.size()] for (i in 0.., V> implements Map { + + private final K[] enumConstants; + private final AtomicReferenceArray values; + + public ConcurrentEnumMap(Class enumClass) { + this.enumConstants = enumClass.getEnumConstants(); + this.values = new AtomicReferenceArray<>(enumConstants.length); + } + + private int indexOf(Object key) { + if (key == null) { + throw new NullPointerException("Key must not be null"); + } + if (key.getClass() != enumConstants[0].getDeclaringClass()) { + throw new IllegalArgumentException("Key has wrong enum type"); + } + @SuppressWarnings("unchecked") + K castKey = (K) key; + return castKey.ordinal(); + } + + @Override + public V get(Object key) { + int idx = indexOf(key); + return values.get(idx); + } + + @Override + public V put(K key, V value) { + int idx = indexOf(key); + return values.getAndSet(idx, value); + } + + @Override + public void putAll(@Nonnull Map m) { + for (Map.Entry e : m.entrySet()) { + put(e.getKey(), e.getValue()); + } + } + + @Override + public V remove(Object key) { + int idx = indexOf(key); + return values.getAndSet(idx, null); + } + + @Override + public V putIfAbsent(@Nonnull K key, V value) { + int idx = indexOf(key); + for (; ; ) { + V existing = values.get(idx); + if (existing != null) { + return existing; + } + if (values.compareAndSet(idx, null, value)) { + return null; + } + } + } + + @Override + public boolean remove(@Nonnull Object key, Object value) { + int idx = indexOf(key); + V cur = values.get(idx); + if (cur == null || !cur.equals(value)) { + return false; + } + return values.compareAndSet(idx, cur, null); + } + + @Override + public boolean replace(@Nonnull K key, @Nonnull V oldValue, @Nonnull V newValue) { + int idx = indexOf(key); + return values.compareAndSet(idx, oldValue, newValue); + } + + @Override + public V replace(@Nonnull K key, @Nonnull V value) { + int idx = indexOf(key); + for (; ; ) { + V cur = values.get(idx); + if (cur == null) { + return null; + } + if (values.compareAndSet(idx, cur, value)) { + return cur; + } + } + } + + @Override + public int size() { + int count = 0; + for (int i = 0; i < values.length(); i++) { + if (values.get(i) != null) { + count++; + } + } + return count; + } + + @Override + public boolean isEmpty() { + for (int i = 0; i < values.length(); i++) { + if (values.get(i) != null) { + return false; + } + } + return true; + } + + @Override + public boolean containsKey(Object key) { + return get(key) != null; + } + + @Override + public boolean containsValue(Object value) { + for (int i = 0; i < values.length(); i++) { + V v = values.get(i); + if (v != null && v.equals(value)) { + return true; + } + } + return false; + } + + @Override + public void clear() { + for (int i = 0; i < values.length(); i++) { + values.set(i, null); + } + } + + @Nonnull + @Override + public Set keySet() { + Set keys = EnumSet.noneOf(enumConstants[0].getDeclaringClass()); + for (int i = 0; i < values.length(); i++) { + if (values.get(i) != null) { + keys.add(enumConstants[i]); + } + } + return Collections.unmodifiableSet(keys); + } + + @Nonnull + @Override + public Collection values() { + List list = new ArrayList<>(); + for (int i = 0; i < values.length(); i++) { + V value = values.get(i); + if (value != null) { + list.add(value); + } + } + return Collections.unmodifiableList(list); + } + + @Nonnull + @Override + public Set> entrySet() { + Set> entrySet = new java.util.HashSet<>(); + for (int i = 0; i < enumConstants.length; i++) { + V value = values.get(i); + if (value != null) { + K key = enumConstants[i]; + entrySet.add(new AbstractMap.SimpleEntry<>(key, value)); + } + } + return Collections.unmodifiableSet(entrySet); + } +} From 408a7d39bc8cdd165a60e8eb80147398ad9f29da Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Thu, 27 Feb 2025 09:22:52 +0100 Subject: [PATCH 08/41] fix code quality violation --- .../src/main/java/datadog/trace/util/ConcurrentEnumMap.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal-api/src/main/java/datadog/trace/util/ConcurrentEnumMap.java b/internal-api/src/main/java/datadog/trace/util/ConcurrentEnumMap.java index 6749baccd9d..1fcc3440686 100644 --- a/internal-api/src/main/java/datadog/trace/util/ConcurrentEnumMap.java +++ b/internal-api/src/main/java/datadog/trace/util/ConcurrentEnumMap.java @@ -61,7 +61,7 @@ public V remove(Object key) { @Override public V putIfAbsent(@Nonnull K key, V value) { int idx = indexOf(key); - for (; ; ) { + while (true) { V existing = values.get(idx); if (existing != null) { return existing; @@ -91,7 +91,7 @@ public boolean replace(@Nonnull K key, @Nonnull V oldValue, @Nonnull V newValue) @Override public V replace(@Nonnull K key, @Nonnull V value) { int idx = indexOf(key); - for (; ; ) { + while (true) { V cur = values.get(idx); if (cur == null) { return null; From 7d28e5afeae0c8fe85157edecc722ef2835092d8 Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Thu, 27 Feb 2025 10:22:11 +0100 Subject: [PATCH 09/41] use framework as component in junit4 and junit5 instrumentations --- .../instrumentation/junit4/TestEventsHandlerHolder.java | 5 ++++- .../instrumentation/junit5/TestEventsHandlerHolder.java | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TestEventsHandlerHolder.java b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TestEventsHandlerHolder.java index 682e982d7ae..db5b9de2b3c 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TestEventsHandlerHolder.java +++ b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TestEventsHandlerHolder.java @@ -28,7 +28,10 @@ public abstract class TestEventsHandlerHolder { public static synchronized void start(TestFrameworkInstrumentation framework) { TestEventsHandler handler = HANDLERS.get(framework); if (handler == null) { - HANDLERS.put(framework, InstrumentationBridge.createTestEventsHandler("junit", null, null)); + HANDLERS.put( + framework, + InstrumentationBridge.createTestEventsHandler( + framework.name().toLowerCase(), null, null)); } } diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java index 70432217a1c..cfffdcb708c 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java +++ b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java @@ -61,7 +61,9 @@ public static synchronized void start( TestFrameworkInstrumentation framework = JUnitPlatformUtils.engineToFramework(testEngine); TestEventsHandler handler = HANDLERS.get(framework); if (handler == null) { - handler = InstrumentationBridge.createTestEventsHandler("junit", suiteStore, testStore); + handler = + InstrumentationBridge.createTestEventsHandler( + framework.name().toLowerCase(), suiteStore, testStore); HANDLERS.put(framework, handler); } } From cfd4fdae622c9794f17973f555e33d446b4ac131 Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Thu, 27 Feb 2025 10:50:07 +0100 Subject: [PATCH 10/41] update test fixtures with new component string --- .../events.ftl | 32 ++++++------ .../events.ftl | 32 ++++++------ .../test-attempt-to-fix-failed/events.ftl | 32 ++++++------ .../events.ftl | 32 ++++++------ .../events.ftl | 32 ++++++------ .../test-attempt-to-fix-succeeded/events.ftl | 32 ++++++------ .../resources/test-disabled-failed/events.ftl | 16 +++--- .../resources/test-efd-known-test/events.ftl | 16 +++--- .../events.ftl | 44 ++++++++-------- .../events.ftl | 44 ++++++++-------- .../test-efd-new-slow-test/events.ftl | 20 +++---- .../resources/test-efd-new-test/events.ftl | 24 ++++----- .../test-empty-name-5.4.0/events.ftl | 16 +++--- .../test-empty-name-latest/events.ftl | 16 +++--- .../test/resources/test-failure/events.ftl | 16 +++--- .../resources/test-itr-skipping/events.ftl | 16 +++--- .../test-itr-unskippable-suite/events.ftl | 16 +++--- .../resources/test-itr-unskippable/events.ftl | 16 +++--- .../test-multiple-features-5.4.0/events.ftl | 24 ++++----- .../test-multiple-features-latest/events.ftl | 24 ++++----- .../test-name-with-brackets/events.ftl | 16 +++--- .../test-quarantined-failed-atr/events.ftl | 32 ++++++------ .../test-quarantined-failed-efd/events.ftl | 24 ++++----- .../test-quarantined-failed-known/events.ftl | 16 +++--- .../test-quarantined-failed/events.ftl | 16 +++--- .../resources/test-retry-failure/events.ftl | 32 ++++++------ .../events.ftl | 44 ++++++++-------- .../events.ftl | 28 +++++----- .../test-scenario-outline-5.4.0/events.ftl | 28 +++++----- .../test-scenario-outline-latest/events.ftl | 28 +++++----- .../test/resources/test-succeed/events.ftl | 16 +++--- .../test-failed-after-class/events.ftl | 20 +++---- .../test-failed-after-param/events.ftl | 20 +++---- .../resources/test-failed-after/events.ftl | 20 +++---- .../test-failed-before-class/events.ftl | 12 ++--- .../test-failed-before-param/events.ftl | 12 ++--- .../resources/test-failed-before/events.ftl | 20 +++---- .../test-succeed-before-after/events.ftl | 20 +++---- .../events.ftl | 20 +++---- .../events.ftl | 20 +++---- .../events.ftl | 32 ++++++------ .../events.ftl | 32 ++++++------ .../test-attempt-to-fix-failed/events.ftl | 32 ++++++------ .../events.ftl | 32 ++++++------ .../events.ftl | 32 ++++++------ .../test-attempt-to-fix-succeeded/events.ftl | 32 ++++++------ .../resources/test-efd-known-test/events.ftl | 16 +++--- .../test-efd-new-slow-test/events.ftl | 20 +++---- .../resources/test-efd-new-test/events.ftl | 24 ++++----- .../test-failed-assumption-0.7.28/events.ftl | 16 +++--- .../test-failed-assumption-latest/events.ftl | 16 +++--- .../test-failed-then-succeed/events.ftl | 24 ++++----- .../src/test/resources/test-failed/events.ftl | 16 +++--- .../test-quarantined-failed-atr/events.ftl | 32 ++++++------ .../test-quarantined-failed-efd/events.ftl | 24 ++++----- .../test-quarantined-failed-known/events.ftl | 16 +++--- .../test-quarantined-failed/events.ftl | 16 +++--- .../resources/test-retry-failed/events.ftl | 32 ++++++------ .../resources/test-skipped-suite/events.ftl | 20 +++---- .../test/resources/test-skipped/events.ftl | 16 +++--- .../test-succeed-impacted/events.ftl | 16 +++--- .../test/resources/test-succeed/events.ftl | 16 +++--- .../events.ftl | 16 +++--- .../events.ftl | 20 +++---- .../test-assumption-failure/events.ftl | 16 +++--- .../test-assumption-is-not-retried/events.ftl | 16 +++--- .../events.ftl | 32 ++++++------ .../events.ftl | 32 ++++++------ .../test-attempt-to-fix-failed/events.ftl | 32 ++++++------ .../events.ftl | 32 ++++++------ .../events.ftl | 32 ++++++------ .../test-attempt-to-fix-succeeded/events.ftl | 32 ++++++------ .../events.ftl | 16 +++--- .../resources/test-class-skipped/events.ftl | 20 +++---- .../events.ftl | 20 +++---- .../resources/test-disabled-failed/events.ftl | 16 +++--- .../events.ftl | 40 +++++++------- .../events.ftl | 20 +++---- .../resources/test-efd-known-test/events.ftl | 16 +++--- .../events.ftl | 32 ++++++------ .../events.ftl | 36 ++++++------- .../test-efd-new-slow-test/events.ftl | 20 +++---- .../resources/test-efd-new-test/events.ftl | 24 ++++----- .../test-efd-new-very-slow-test/events.ftl | 16 +++--- .../src/test/resources/test-error/events.ftl | 16 +++--- .../events.ftl | 16 +++--- .../test-failed-then-succeed/events.ftl | 28 +++++----- .../src/test/resources/test-failed/events.ftl | 16 +++--- .../resources/test-inheritance/events.ftl | 16 +++--- .../events.ftl | 20 +++---- .../resources/test-itr-skipping/events.ftl | 24 ++++----- .../events.ftl | 16 +++--- .../test-itr-unskippable-suite/events.ftl | 16 +++--- .../resources/test-itr-unskippable/events.ftl | 16 +++--- .../src/test/resources/test-legacy/events.ftl | 16 +++--- .../events.ftl | 28 +++++----- .../events.ftl | 20 +++---- .../resources/test-parameterized/events.ftl | 20 +++---- .../test-quarantined-failed-atr/events.ftl | 32 ++++++------ .../test-quarantined-failed-efd/events.ftl | 24 ++++----- .../test-quarantined-failed-known/events.ftl | 16 +++--- .../events.ftl | 20 +++---- .../test-quarantined-failed/events.ftl | 16 +++--- .../resources/test-retry-failed/events.ftl | 32 ++++++------ .../test-retry-parameterized/events.ftl | 36 ++++++------- .../test-skipped-is-not-retried/events.ftl | 16 +++--- .../test/resources/test-skipped/events.ftl | 16 +++--- .../test-succeed-impacted/events.ftl | 16 +++--- .../resources/test-succeed-kotlin/events.ftl | 16 +++--- .../events.ftl | 20 +++---- .../test/resources/test-succeed/events.ftl | 16 +++--- .../test-success-and-failure/events.ftl | 24 ++++----- .../test-success-and-skipped/events.ftl | 20 +++---- .../events.ftl | 32 ++++++------ .../resources/test-suite-runner/events.ftl | 24 ++++----- .../test-suite-setup-failure/events.ftl | 12 ++--- .../test-suite-teardown-failure/events.ftl | 20 +++---- .../events.ftl | 32 ++++++------ .../events.ftl | 32 ++++++------ .../test-attempt-to-fix-failed/events.ftl | 32 ++++++------ .../events.ftl | 32 ++++++------ .../events.ftl | 32 ++++++------ .../test-attempt-to-fix-succeeded/events.ftl | 32 ++++++------ .../resources/test-disabled-failed/events.ftl | 16 +++--- .../resources/test-efd-known-test/events.ftl | 16 +++--- .../events.ftl | 44 ++++++++-------- .../events.ftl | 44 ++++++++-------- .../test-efd-new-slow-test/events.ftl | 20 +++---- .../resources/test-efd-new-test/events.ftl | 24 ++++----- .../test-failed-then-succeed/events.ftl | 24 ++++----- .../resources/test-itr-skipping/events.ftl | 16 +++--- .../test-itr-unskippable-suite/events.ftl | 16 +++--- .../resources/test-itr-unskippable/events.ftl | 16 +++--- .../resources/test-no-retry-failed/events.ftl | 16 +++--- .../resources/test-parallel/coverages.ftl | 12 ++--- .../test/resources/test-parallel/events.ftl | 28 +++++----- .../test-quarantined-failed-atr/events.ftl | 32 ++++++------ .../test-quarantined-failed-efd/events.ftl | 24 ++++----- .../test-quarantined-failed-known/events.ftl | 16 +++--- .../test-quarantined-failed/events.ftl | 16 +++--- .../events.ftl | 36 ++++++------- .../events.ftl | 36 ++++++------- .../resources/test-retry-failed/events.ftl | 32 ++++++------ .../test-scenario-outline-5.4.0/events.ftl | 28 +++++----- .../test-scenario-outline-latest/events.ftl | 28 +++++----- .../resources/test-skipped-feature/events.ftl | 20 +++---- .../events.ftl | 28 +++++----- .../events.ftl | 28 +++++----- .../test/resources/test-skipped/events.ftl | 20 +++---- .../test/resources/test-succeed/events.ftl | 16 +++--- .../test-before-all-after-all/events.ftl | 20 +++---- .../test-before-each-after-each/events.ftl | 20 +++---- .../test-failed-after-all/events.ftl | 20 +++---- .../test-failed-after-each/events.ftl | 20 +++---- .../test-failed-before-all/events.ftl | 12 ++--- .../test-failed-before-each/events.ftl | 20 +++---- .../events.ftl | 32 ++++++------ .../events.ftl | 32 ++++++------ .../test-attempt-to-fix-failed/events.ftl | 32 ++++++------ .../events.ftl | 32 ++++++------ .../events.ftl | 32 ++++++------ .../test-attempt-to-fix-succeeded/events.ftl | 32 ++++++------ .../events.ftl | 20 +++---- .../resources/test-disabled-failed/events.ftl | 16 +++--- .../events.ftl | 40 +++++++------- .../events.ftl | 20 +++---- .../resources/test-efd-known-test/events.ftl | 16 +++--- .../events.ftl | 28 +++++----- .../events.ftl | 36 ++++++------- .../test-efd-new-slow-test/events.ftl | 20 +++---- .../resources/test-efd-new-test/events.ftl | 24 ++++----- .../test-efd-new-very-slow-test/events.ftl | 16 +++--- .../test-failed-then-succeed/events.ftl | 28 +++++----- .../src/test/resources/test-failed/events.ftl | 16 +++--- .../events.ftl | 20 +++---- .../events.ftl | 20 +++---- .../events.ftl | 20 +++---- .../test-itr-skipping-spec-setup/events.ftl | 20 +++---- .../resources/test-itr-skipping/events.ftl | 16 +++--- .../test-itr-unskippable-suite/events.ftl | 16 +++--- .../resources/test-itr-unskippable/events.ftl | 16 +++--- .../events.ftl | 28 +++++----- .../test-quarantined-failed-atr/events.ftl | 32 ++++++------ .../test-quarantined-failed-efd/events.ftl | 24 ++++----- .../test-quarantined-failed-known/events.ftl | 16 +++--- .../events.ftl | 20 +++---- .../test-quarantined-failed/events.ftl | 16 +++--- .../resources/test-retry-failed/events.ftl | 32 ++++++------ .../test-retry-parameterized/events.ftl | 36 ++++++------- .../test-succeed-impacted/events.ftl | 16 +++--- .../test-succeed-parameterized/events.ftl | 20 +++---- .../test/resources/test-succeed/events.ftl | 16 +++--- .../test-assumption-failed-legacy/events.ftl | 16 +++--- .../test-assumption-failed/events.ftl | 16 +++--- .../test-assumption-is-not-retried/events.ftl | 16 +++--- .../events.ftl | 32 ++++++------ .../events.ftl | 32 ++++++------ .../test-attempt-to-fix-failed/events.ftl | 32 ++++++------ .../events.ftl | 32 ++++++------ .../events.ftl | 32 ++++++------ .../test-attempt-to-fix-succeeded/events.ftl | 32 ++++++------ .../test/resources/test-categories/events.ftl | 16 +++--- .../events.ftl | 16 +++--- .../resources/test-disabled-failed/events.ftl | 16 +++--- .../events.ftl | 40 +++++++------- .../events.ftl | 20 +++---- .../resources/test-efd-known-test/events.ftl | 16 +++--- .../events.ftl | 32 ++++++------ .../events.ftl | 36 ++++++------- .../test-efd-new-slow-test/events.ftl | 20 +++---- .../resources/test-efd-new-test/events.ftl | 24 ++++----- .../test-efd-new-very-slow-test/events.ftl | 16 +++--- .../src/test/resources/test-error/events.ftl | 16 +++--- .../events.ftl | 16 +++--- .../test/resources/test-factory/events.ftl | 20 +++---- .../test-failed-then-succeed/events.ftl | 28 +++++----- .../src/test/resources/test-failed/events.ftl | 16 +++--- .../resources/test-inheritance/events.ftl | 16 +++--- .../test-itr-skipping-parametrized/events.ftl | 20 +++---- .../resources/test-itr-skipping/events.ftl | 24 ++++----- .../events.ftl | 16 +++--- .../test-itr-unskippable-suite/events.ftl | 16 +++--- .../resources/test-itr-unskippable/events.ftl | 16 +++--- .../resources/test-parameterized/events.ftl | 20 +++---- .../test-quarantined-failed-atr/events.ftl | 32 ++++++------ .../test-quarantined-failed-efd/events.ftl | 24 ++++----- .../test-quarantined-failed-known/events.ftl | 16 +++--- .../events.ftl | 20 +++---- .../test-quarantined-failed/events.ftl | 16 +++--- .../test/resources/test-repeated/events.ftl | 20 +++---- .../resources/test-retry-factory/events.ftl | 36 ++++++------- .../resources/test-retry-failed/events.ftl | 32 ++++++------ .../test-retry-parameterized/events.ftl | 52 +++++++++---------- .../resources/test-retry-template/events.ftl | 36 ++++++------- .../resources/test-skipped-class/events.ftl | 28 +++++----- .../test-skipped-is-not-retried/events.ftl | 16 +++--- .../test-skipped-nested-suites/events.ftl | 24 ++++----- .../test/resources/test-skipped/events.ftl | 16 +++--- .../events.ftl | 32 ++++++------ .../test-succeed-and-failed/events.ftl | 24 ++++----- .../test-succeed-and-skipped/events.ftl | 20 +++---- .../test-succeed-impacted/events.ftl | 16 +++--- .../test-succeed-multiple-suites/events.ftl | 28 +++++----- .../test-succeed-nested-suites/events.ftl | 24 ++++----- .../test/resources/test-succeed/events.ftl | 16 +++--- .../events.ftl | 20 +++---- .../events.ftl | 16 +++--- .../test-suite-setup-failed/events.ftl | 12 ++--- .../test-suite-teardown-failed/events.ftl | 20 +++---- .../test/resources/test-template/events.ftl | 20 +++---- 250 files changed, 2906 insertions(+), 2906 deletions(-) diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl index 6ef3d88f843..46ee043c406 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -65,7 +65,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -85,7 +85,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -115,7 +115,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -135,7 +135,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -165,7 +165,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -185,7 +185,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -215,7 +215,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -235,7 +235,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -266,7 +266,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -287,7 +287,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -308,7 +308,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, @@ -322,7 +322,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -338,7 +338,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_8}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl index abfe2d738d3..670dc9c3a44 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -62,7 +62,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -82,7 +82,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -109,7 +109,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -129,7 +129,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -156,7 +156,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -176,7 +176,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -203,7 +203,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -223,7 +223,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -251,7 +251,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -272,7 +272,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -293,7 +293,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, @@ -307,7 +307,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -323,7 +323,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_8}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-failed/events.ftl index e9f20763f8e..5039ebefc3c 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-failed/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -64,7 +64,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -84,7 +84,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -113,7 +113,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -133,7 +133,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -162,7 +162,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -182,7 +182,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -211,7 +211,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -231,7 +231,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -261,7 +261,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -282,7 +282,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -303,7 +303,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, @@ -317,7 +317,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -333,7 +333,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_8}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl index 66e78a94c94..58f2dd7f314 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -65,7 +65,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -85,7 +85,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -115,7 +115,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -135,7 +135,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -165,7 +165,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -185,7 +185,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -215,7 +215,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -235,7 +235,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -266,7 +266,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -287,7 +287,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -308,7 +308,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, @@ -322,7 +322,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -338,7 +338,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_8}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl index e5451c45d76..34591f86c42 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -62,7 +62,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -82,7 +82,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -109,7 +109,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -129,7 +129,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -156,7 +156,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -176,7 +176,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -203,7 +203,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -223,7 +223,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -251,7 +251,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -272,7 +272,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -293,7 +293,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, @@ -307,7 +307,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -323,7 +323,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_8}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-succeeded/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-succeeded/events.ftl index 63705497c7e..75082887a44 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-succeeded/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-attempt-to-fix-succeeded/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -61,7 +61,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -81,7 +81,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -107,7 +107,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -127,7 +127,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -153,7 +153,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -173,7 +173,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -199,7 +199,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -219,7 +219,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -246,7 +246,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -267,7 +267,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -288,7 +288,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, @@ -302,7 +302,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -318,7 +318,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_8}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-disabled-failed/events.ftl index e7bc82f2a6e..b6cfe804f1f 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-disabled-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-disabled-failed/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -62,7 +62,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -83,7 +83,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -104,7 +104,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -118,7 +118,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -134,7 +134,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-known-test/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-known-test/events.ftl index c30945b31ab..3b43ccbbbcd 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-known-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-known-test/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -60,7 +60,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -81,7 +81,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -102,7 +102,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -116,7 +116,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -132,7 +132,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-5.4.0/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-5.4.0/events.ftl index 84ae7f50a94..372b1f06889 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-5.4.0/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-5.4.0/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -61,7 +61,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -81,7 +81,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -107,7 +107,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -127,7 +127,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -153,7 +153,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -173,7 +173,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -197,7 +197,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -217,7 +217,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -243,7 +243,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -263,7 +263,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -289,7 +289,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -309,7 +309,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -333,7 +333,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -353,7 +353,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -377,7 +377,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -398,7 +398,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -420,7 +420,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_10}, @@ -434,7 +434,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -451,7 +451,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_11} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_11}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-latest/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-latest/events.ftl index 84ed609243c..310806a3dd3 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-latest/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-scenario-outline-latest/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -61,7 +61,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions #1", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -81,7 +81,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -107,7 +107,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions #1", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -127,7 +127,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -153,7 +153,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions #1", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -173,7 +173,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -197,7 +197,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions #2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -217,7 +217,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -243,7 +243,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions #2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -263,7 +263,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -289,7 +289,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions #2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -309,7 +309,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -333,7 +333,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions #3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -353,7 +353,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -377,7 +377,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions #4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -398,7 +398,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -420,7 +420,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_10}, @@ -434,7 +434,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -451,7 +451,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_11} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_11}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-slow-test/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-slow-test/events.ftl index a8dbd324e27..b4a7577f49c 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-slow-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-slow-test/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_slow.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -61,7 +61,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_slow.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -81,7 +81,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -107,7 +107,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_slow.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -128,7 +128,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -149,7 +149,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, @@ -163,7 +163,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -179,7 +179,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_5}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-test/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-test/events.ftl index e2c2fe1550b..5134b0be663 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-efd-new-test/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -61,7 +61,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -81,7 +81,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -107,7 +107,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -127,7 +127,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -153,7 +153,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -174,7 +174,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -195,7 +195,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_5}, @@ -209,7 +209,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -225,7 +225,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_6}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-empty-name-5.4.0/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-empty-name-5.4.0/events.ftl index a986c419569..a8c82c333f7 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-empty-name-5.4.0/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-empty-name-5.4.0/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/empty_scenario_name.feature:EMPTY_NAME", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -60,7 +60,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/empty_scenario_name.feature:EMPTY_NAME.EMPTY_NAME", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -81,7 +81,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -101,7 +101,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -115,7 +115,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -130,7 +130,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-empty-name-latest/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-empty-name-latest/events.ftl index 25b6e9c7a8d..b81168a9990 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-empty-name-latest/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-empty-name-latest/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/empty_scenario_name.feature:EMPTY_NAME", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -60,7 +60,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/empty_scenario_name.feature:EMPTY_NAME.LINE:7", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -81,7 +81,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -101,7 +101,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -115,7 +115,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -130,7 +130,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-failure/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-failure/events.ftl index 40d75f5acb1..556066e94d2 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-failure/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-failure/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -63,7 +63,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -84,7 +84,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -104,7 +104,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -118,7 +118,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -133,7 +133,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-skipping/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-skipping/events.ftl index badbf34c0ac..e143e3612d8 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-skipping/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-skipping/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -38,7 +38,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -63,7 +63,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -85,7 +85,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -108,7 +108,7 @@ "process_id" : ${content_metrics_process_id}, "test.itr.tests_skipping.count" : 1 }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -123,7 +123,7 @@ "meta" : { "_dd.ci.itr.tests_skipped" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -141,7 +141,7 @@ "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}, "test.itr.tests_skipping.count" : 1 }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable-suite/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable-suite/events.ftl index 3078269bf29..eb109113f6d 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable-suite/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable-suite/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -38,7 +38,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -63,7 +63,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -84,7 +84,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -107,7 +107,7 @@ "process_id" : ${content_metrics_process_id}, "test.itr.tests_skipping.count" : 0 }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -121,7 +121,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -139,7 +139,7 @@ "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}, "test.itr.tests_skipping.count" : 0 }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable/events.ftl index 81d826acd57..5f90cb69a2b 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-itr-unskippable/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -38,7 +38,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -63,7 +63,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -84,7 +84,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -107,7 +107,7 @@ "process_id" : ${content_metrics_process_id}, "test.itr.tests_skipping.count" : 0 }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -121,7 +121,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -139,7 +139,7 @@ "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}, "test.itr.tests_skipping.count" : 0 }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-5.4.0/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-5.4.0/events.ftl index d56cdd19fe4..b7ac919210b 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-5.4.0/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-5.4.0/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -60,7 +60,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -79,7 +79,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -95,7 +95,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -112,7 +112,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -138,7 +138,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -159,7 +159,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_3}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -179,7 +179,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_5}, @@ -193,7 +193,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -208,7 +208,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_6}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-latest/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-latest/events.ftl index 6df1d8a2f44..6eb0d793843 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-latest/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-multiple-features-latest/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic #1", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -60,7 +60,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic #1.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -79,7 +79,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -95,7 +95,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic #2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -112,7 +112,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -138,7 +138,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic #2.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -159,7 +159,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_3}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -179,7 +179,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_5}, @@ -193,7 +193,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -208,7 +208,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_6}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-name-with-brackets/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-name-with-brackets/events.ftl index ecf34dc0965..0e17d12ca9d 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-name-with-brackets/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-name-with-brackets/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/name_with_brackets.feature:This (Name) Has Bracket Characters", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -60,7 +60,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/name_with_brackets.feature:This (Name) Has Bracket Characters.Addition (Has) Brackets Too", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -81,7 +81,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -101,7 +101,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -115,7 +115,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -130,7 +130,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-atr/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-atr/events.ftl index ecfa9f13d11..98c335df14c 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-atr/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-atr/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -64,7 +64,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -84,7 +84,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -113,7 +113,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -133,7 +133,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -162,7 +162,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -182,7 +182,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -211,7 +211,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -231,7 +231,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -261,7 +261,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -282,7 +282,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -303,7 +303,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, @@ -317,7 +317,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -333,7 +333,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_8}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-efd/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-efd/events.ftl index 873b71b6552..a9f132db898 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-efd/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-efd/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -65,7 +65,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -85,7 +85,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -115,7 +115,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -135,7 +135,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -166,7 +166,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -187,7 +187,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -209,7 +209,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_5}, @@ -223,7 +223,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -240,7 +240,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_6}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-known/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-known/events.ftl index ad3d947ca17..e79c800340e 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-known/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-known/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -64,7 +64,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -85,7 +85,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -107,7 +107,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -121,7 +121,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -138,7 +138,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed/events.ftl index 8a75ade8bc0..65dbb7bdb6e 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -64,7 +64,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -85,7 +85,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -106,7 +106,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -120,7 +120,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -136,7 +136,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-failure/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-failure/events.ftl index e68e6daa057..563b93d6bbb 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-failure/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-failure/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -63,7 +63,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -83,7 +83,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -111,7 +111,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -131,7 +131,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -159,7 +159,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -179,7 +179,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -207,7 +207,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -227,7 +227,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -256,7 +256,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -277,7 +277,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -297,7 +297,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, @@ -311,7 +311,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -326,7 +326,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_8}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-5.4.0/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-5.4.0/events.ftl index 5d05ced5b68..48dbbfc04ee 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-5.4.0/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-5.4.0/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -60,7 +60,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -80,7 +80,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -103,7 +103,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -123,7 +123,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -149,7 +149,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -169,7 +169,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -197,7 +197,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -217,7 +217,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -245,7 +245,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -265,7 +265,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -293,7 +293,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -313,7 +313,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -342,7 +342,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -362,7 +362,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -385,7 +385,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -406,7 +406,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -426,7 +426,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_10}, @@ -440,7 +440,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -455,7 +455,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_11} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_11}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-latest/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-latest/events.ftl index 3ec37f03dd6..918b5307ed8 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-latest/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-latest/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -60,7 +60,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples.Many additions #1", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -80,7 +80,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -103,7 +103,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples.Many additions #2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -123,7 +123,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -149,7 +149,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples.Many additions #3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -169,7 +169,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -192,7 +192,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_failed.feature:Basic Arithmetic With Examples.Many additions #4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -213,7 +213,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -233,7 +233,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_6}, @@ -247,7 +247,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -262,7 +262,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-5.4.0/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-5.4.0/events.ftl index ca8095518e5..ee9c5054418 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-5.4.0/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-5.4.0/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -60,7 +60,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -80,7 +80,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -103,7 +103,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -123,7 +123,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -146,7 +146,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -166,7 +166,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -189,7 +189,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -210,7 +210,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -230,7 +230,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_6}, @@ -244,7 +244,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -259,7 +259,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-latest/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-latest/events.ftl index 347251b38bb..505940e33e8 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-latest/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-scenario-outline-latest/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -60,7 +60,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions #1", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -80,7 +80,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -103,7 +103,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions #2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -123,7 +123,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -146,7 +146,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions #3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -166,7 +166,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -189,7 +189,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions #4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -210,7 +210,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -230,7 +230,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_6}, @@ -244,7 +244,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -259,7 +259,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-succeed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-succeed/events.ftl index b007b479917..d1ac6032827 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-succeed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-succeed/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -60,7 +60,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -81,7 +81,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -101,7 +101,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -115,7 +115,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -130,7 +130,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-class/events.ftl b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-class/events.ftl index e0b54e4b12e..02d56eccc43 100644 --- a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-class/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-class/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.13", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.13", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 1, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -93,7 +93,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailedAfterClass", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -110,7 +110,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -137,7 +137,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAfterClass.another_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -157,7 +157,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -184,7 +184,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAfterClass.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-param/events.ftl b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-param/events.ftl index 916bf7a309d..796df78720d 100644 --- a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-param/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after-param/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.13", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.13", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailedAfterParam", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAfterParam.parameterized_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -155,7 +155,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -183,7 +183,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAfterParam.parameterized_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after/events.ftl b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after/events.ftl index 3285a104314..d9fe0e52f83 100644 --- a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-after/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.13", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.13", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailedAfter", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -137,7 +137,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAfter.another_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -157,7 +157,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -187,7 +187,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAfter.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-class/events.ftl b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-class/events.ftl index 8babbbea88b..7c471a91a82 100644 --- a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-class/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-class/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.13", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.13", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 1, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -93,7 +93,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailedBeforeClass", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-param/events.ftl b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-param/events.ftl index 4ab3b38a4ad..a0304404821 100644 --- a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-param/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before-param/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.13", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.13", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailedBeforeParam", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before/events.ftl b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before/events.ftl index b3d66d51728..b7d2a82e8ff 100644 --- a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-failed-before/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.13", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.13", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailedBefore", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -137,7 +137,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedBefore.another_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -157,7 +157,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -187,7 +187,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedBefore.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-after/events.ftl b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-after/events.ftl index 2934d64a75e..7c73fee7a7b 100644 --- a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-after/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-after/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.13", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.13", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceedBeforeAfter", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -134,7 +134,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedBeforeAfter.another_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -154,7 +154,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -181,7 +181,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedBeforeAfter.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-class-after-class/events.ftl b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-class-after-class/events.ftl index 1b469df92ab..da6c129f7a2 100644 --- a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-class-after-class/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-class-after-class/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.13", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.13", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceedBeforeClassAfterClass", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -134,7 +134,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedBeforeClassAfterClass.another_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -154,7 +154,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -181,7 +181,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedBeforeClassAfterClass.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-param-after-param/events.ftl b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-param-after-param/events.ftl index 8181de476b5..775fbc2395b 100644 --- a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-param-after-param/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/resources/test-succeed-before-param-after-param/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.13", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.13", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceedBeforeParamAfterParam", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedBeforeParamAfterParam.parameterized_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -155,7 +155,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -183,7 +183,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedBeforeParamAfterParam.parameterized_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl index d6b663ba666..3cc647b3962 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestFailedMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -139,7 +139,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -159,7 +159,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -191,7 +191,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -211,7 +211,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -243,7 +243,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -263,7 +263,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -295,7 +295,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -315,7 +315,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -348,7 +348,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl index 79bc536d296..b087d18e6ce 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestSucceedMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -136,7 +136,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -156,7 +156,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -185,7 +185,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -205,7 +205,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -234,7 +234,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -254,7 +254,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -283,7 +283,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -303,7 +303,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -333,7 +333,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-failed/events.ftl index 9d742115d5d..b2f81d70dc4 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-failed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestFailedMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -138,7 +138,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -158,7 +158,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -189,7 +189,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -209,7 +209,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -240,7 +240,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -260,7 +260,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -291,7 +291,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -311,7 +311,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -343,7 +343,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl index ea0af0a1e37..68a49579de4 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestFailedMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -139,7 +139,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -159,7 +159,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -191,7 +191,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -211,7 +211,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -243,7 +243,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -263,7 +263,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -295,7 +295,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -315,7 +315,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -348,7 +348,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl index 22a1f754b1d..6d687f6ce16 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestSucceedMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -136,7 +136,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -156,7 +156,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -185,7 +185,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -205,7 +205,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -234,7 +234,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -254,7 +254,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -283,7 +283,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -303,7 +303,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -333,7 +333,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-succeeded/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-succeeded/events.ftl index 266e6144c1b..b9aa7b96431 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-succeeded/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-attempt-to-fix-succeeded/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestSucceedMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -155,7 +155,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -183,7 +183,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -203,7 +203,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -231,7 +231,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -251,7 +251,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -279,7 +279,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -299,7 +299,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -328,7 +328,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-known-test/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-known-test/events.ftl index fd6c0cdf705..57ae4464214 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-known-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-known-test/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestSucceedMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -134,7 +134,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-new-slow-test/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-new-slow-test/events.ftl index fefa5428dcb..05e8d25511a 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-new-slow-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-new-slow-test/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestSucceedMUnitSlow", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -134,7 +134,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnitSlow.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -154,7 +154,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -181,7 +181,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnitSlow.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-new-test/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-new-test/events.ftl index 2db5a65169a..cee20aa46b2 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-new-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-efd-new-test/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestSucceedMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -155,7 +155,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -183,7 +183,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -203,7 +203,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -231,7 +231,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-0.7.28/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-0.7.28/events.ftl index fecff1b380a..1e0c0b49ea1 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-0.7.28/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-0.7.28/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestFailedAssumptionMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -131,7 +131,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAssumptionMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-latest/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-latest/events.ftl index 88076b804c6..91cdec65340 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-latest/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-assumption-latest/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestFailedAssumptionMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -132,7 +132,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAssumptionMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-then-succeed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-then-succeed/events.ftl index f479a9c9bf7..0062abe47c7 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-then-succeed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-then-succeed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestFailedThenSucceedMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -135,7 +135,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedThenSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -155,7 +155,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message_2}, @@ -185,7 +185,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedThenSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -205,7 +205,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -232,7 +232,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedThenSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed/events.ftl index dc8e3421f59..59b0e03f115 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestFailedMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -135,7 +135,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-atr/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-atr/events.ftl index 829b39c272a..f342fa1944a 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-atr/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-atr/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestFailedMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -138,7 +138,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -158,7 +158,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -189,7 +189,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -209,7 +209,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -240,7 +240,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -260,7 +260,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -291,7 +291,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -311,7 +311,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -343,7 +343,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-efd/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-efd/events.ftl index 155dcf123d3..686698bdfd5 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-efd/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-efd/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -28,7 +28,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -42,7 +42,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -59,7 +59,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -74,7 +74,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -94,7 +94,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestFailedMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -111,7 +111,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -141,7 +141,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -161,7 +161,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -193,7 +193,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -213,7 +213,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -246,7 +246,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-known/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-known/events.ftl index b72db7bc168..5cc2916c4c9 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-known/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-known/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -28,7 +28,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -42,7 +42,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -59,7 +59,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -74,7 +74,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -94,7 +94,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestFailedMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -111,7 +111,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -140,7 +140,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed/events.ftl index b4ff261d152..31324d609f7 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestFailedMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -138,7 +138,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-retry-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-retry-failed/events.ftl index ddd8c1d5e36..29851450ffe 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-retry-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-retry-failed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestFailedMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -135,7 +135,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -155,7 +155,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -185,7 +185,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -205,7 +205,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -235,7 +235,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -255,7 +255,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -285,7 +285,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -305,7 +305,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -336,7 +336,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-skipped-suite/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-skipped-suite/events.ftl index eb84ab78838..c7c0182bf44 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-skipped-suite/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-skipped-suite/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestSkippedSuiteMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -132,7 +132,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSkippedSuiteMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -152,7 +152,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -177,7 +177,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSkippedSuiteMUnit.Calculator.subtract", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-skipped/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-skipped/events.ftl index c737a3b8b61..ffc9f6f904c 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-skipped/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-skipped/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestSkippedMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -132,7 +132,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSkippedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-succeed-impacted/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-succeed-impacted/events.ftl index 5fa9c5b5e53..76fee7dc3f4 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-succeed-impacted/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-succeed-impacted/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestSucceedMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -133,7 +133,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-succeed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-succeed/events.ftl index 998ea750c24..38e3756efcc 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-succeed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-succeed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "munit.test_session", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "munit.test_module", "resource" : "munit-junit-4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "munit.test_suite", "resource" : "org.example.TestSucceedMUnit", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "munit", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -132,7 +132,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "munit.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedMUnit.Calculator.add", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure-during-suite-setup/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure-during-suite-setup/events.ftl index 56f0f7bc7e5..bf5a9b16202 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure-during-suite-setup/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure-during-suite-setup/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -91,7 +91,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailedSuiteSetUpAssumption", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -108,7 +108,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -136,7 +136,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSuiteSetUpAssumption.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure-in-a-multi-test-case-suite/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure-in-a-multi-test-case-suite/events.ftl index 688f384da6e..069f98d0a33 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure-in-a-multi-test-case-suite/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure-in-a-multi-test-case-suite/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestAssumptionAndSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestAssumptionAndSucceed.test_fail_assumption", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -155,7 +155,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -182,7 +182,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestAssumptionAndSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure/events.ftl index 4df8e35cb84..f228618076a 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-failure/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestAssumption", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestAssumption.test_fail_assumption", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-is-not-retried/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-is-not-retried/events.ftl index 4df8e35cb84..f228618076a 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-is-not-retried/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-assumption-is-not-retried/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestAssumption", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestAssumption.test_fail_assumption", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl index 516d508c6ed..71c4f6a6c4e 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack}, @@ -140,7 +140,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -160,7 +160,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_2}, @@ -193,7 +193,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -213,7 +213,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_3}, @@ -246,7 +246,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -266,7 +266,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_4}, @@ -299,7 +299,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -319,7 +319,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_5}, @@ -353,7 +353,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl index 023d9693ea4..29c6b99263d 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -138,7 +138,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -158,7 +158,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -189,7 +189,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -209,7 +209,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -240,7 +240,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -260,7 +260,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -291,7 +291,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -311,7 +311,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -343,7 +343,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-failed/events.ftl index 61b5c17029f..59ae568ed34 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-failed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack}, @@ -139,7 +139,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -159,7 +159,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_2}, @@ -191,7 +191,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -211,7 +211,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_3}, @@ -243,7 +243,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -263,7 +263,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_4}, @@ -295,7 +295,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -315,7 +315,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_5}, @@ -348,7 +348,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl index 79833fb556e..44eda3db707 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack}, @@ -140,7 +140,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -160,7 +160,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_2}, @@ -193,7 +193,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -213,7 +213,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_3}, @@ -246,7 +246,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -266,7 +266,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_4}, @@ -299,7 +299,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -319,7 +319,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_5}, @@ -353,7 +353,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl index ad5549d4098..e2cdbd32b77 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -138,7 +138,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -158,7 +158,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -189,7 +189,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -209,7 +209,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -240,7 +240,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -260,7 +260,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -291,7 +291,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -311,7 +311,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -343,7 +343,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-succeeded/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-succeeded/events.ftl index 413fe494fa5..4ac19a90342 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-succeeded/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-attempt-to-fix-succeeded/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -137,7 +137,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -157,7 +157,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -187,7 +187,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -207,7 +207,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -237,7 +237,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -257,7 +257,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -287,7 +287,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -307,7 +307,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -338,7 +338,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-categories-are-included-in-spans/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-categories-are-included-in-spans/events.ftl index e00887f9a6e..5738514496d 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-categories-are-included-in-spans/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-categories-are-included-in-spans/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -91,7 +91,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceedWithCategories", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -108,7 +108,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -136,7 +136,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedWithCategories.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-class-skipped/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-class-skipped/events.ftl index c54160aa958..9abbcef90a0 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-class-skipped/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-class-skipped/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -91,7 +91,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSkippedClass", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -108,7 +108,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -136,7 +136,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSkippedClass.test_class_another_skipped", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -156,7 +156,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -184,7 +184,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSkippedClass.test_class_skipped", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-disabled-failed-parameterized/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-disabled-failed-parameterized/events.ftl index 16ad8909c37..faabbeed521 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-disabled-failed-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-disabled-failed-parameterized/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailedParameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -139,7 +139,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterized.test_failed_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -159,7 +159,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -189,7 +189,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterized.test_failed_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-disabled-failed/events.ftl index ae7473fb54f..c383ea63517 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-disabled-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-disabled-failed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -138,7 +138,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-faulty-session-threshold/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-faulty-session-threshold/events.ftl index 183ebd55f7e..79965d6fca7 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-faulty-session-threshold/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-faulty-session-threshold/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -28,7 +28,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -42,7 +42,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -59,7 +59,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -74,7 +74,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -94,7 +94,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailedAndSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -111,7 +111,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -139,7 +139,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_another_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -159,7 +159,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -189,7 +189,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_another_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -209,7 +209,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -239,7 +239,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_another_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -259,7 +259,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack}, @@ -289,7 +289,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -309,7 +309,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_2}, @@ -341,7 +341,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -361,7 +361,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_3}, @@ -394,7 +394,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -414,7 +414,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -442,7 +442,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-known-parameterized-test/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-known-parameterized-test/events.ftl index 04e8ce5d13b..1cb21d5428e 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-known-parameterized-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-known-parameterized-test/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestParameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -137,7 +137,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterized.parameterized_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -157,7 +157,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -185,7 +185,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterized.parameterized_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-known-test/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-known-test/events.ftl index 1fc739404f1..847528d5ac7 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-known-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-known-test/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -136,7 +136,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-known-tests-and-new-test/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-known-tests-and-new-test/events.ftl index bf4a41fb58a..b975f569af5 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-known-tests-and-new-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-known-tests-and-new-test/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailedAndSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -137,7 +137,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_another_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -157,7 +157,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -187,7 +187,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_another_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -207,7 +207,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -237,7 +237,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_another_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -257,7 +257,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack}, @@ -286,7 +286,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -306,7 +306,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -333,7 +333,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-parameterized-test/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-parameterized-test/events.ftl index ee4dc7e2c68..787eafaf2be 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-parameterized-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-parameterized-test/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -28,7 +28,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -42,7 +42,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -59,7 +59,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -74,7 +74,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -94,7 +94,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestParameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -111,7 +111,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -140,7 +140,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterized.parameterized_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -160,7 +160,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -191,7 +191,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterized.parameterized_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -211,7 +211,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -242,7 +242,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterized.parameterized_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -262,7 +262,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -291,7 +291,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterized.parameterized_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -311,7 +311,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -342,7 +342,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterized.parameterized_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -362,7 +362,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -393,7 +393,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterized.parameterized_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-slow-test/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-slow-test/events.ftl index 145ff353be0..b940fe5e3c3 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-slow-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-slow-test/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceedSlow", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -137,7 +137,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSlow.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -157,7 +157,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -187,7 +187,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSlow.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-test/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-test/events.ftl index fd1c1c4f6ba..164e2e5ce5e 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-test/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -137,7 +137,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -157,7 +157,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -187,7 +187,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -207,7 +207,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -237,7 +237,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-very-slow-test/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-very-slow-test/events.ftl index 5fa609d27f7..c3c740336cd 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-very-slow-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-efd-new-very-slow-test/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceedVerySlow", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -137,7 +137,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedVerySlow.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-error/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-error/events.ftl index 3162990ad35..e68859daa7b 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-error/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-error/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestError", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -137,7 +137,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestError.test_error", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-expected-exception-is-not-retried/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-expected-exception-is-not-retried/events.ftl index 10536415451..ae6b890a34e 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-expected-exception-is-not-retried/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-expected-exception-is-not-retried/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceedExpectedException", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -134,7 +134,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedExpectedException.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-failed-then-succeed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-failed-then-succeed/events.ftl index 6f70ee03e59..ab4a93d264d 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-failed-then-succeed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-failed-then-succeed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailedThenSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -137,7 +137,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedThenSucceed.test_failed_then_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -157,7 +157,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -189,7 +189,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedThenSucceed.test_failed_then_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -209,7 +209,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -241,7 +241,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedThenSucceed.test_failed_then_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -261,7 +261,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -290,7 +290,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedThenSucceed.test_failed_then_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-failed/events.ftl index 661f29b1b5f..b176152eb27 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-failed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack}, @@ -136,7 +136,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-inheritance/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-inheritance/events.ftl index afd2b7f73e9..9376657a938 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-inheritance/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-inheritance/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestInheritance", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -134,7 +134,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestInheritance.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-skipping-parameterized/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-skipping-parameterized/events.ftl index 73997857d7c..94d7015d89b 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-skipping-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-skipping-parameterized/events.ftl @@ -7,7 +7,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -30,7 +30,7 @@ "process_id" : ${content_metrics_process_id}, "test.itr.tests_skipping.count" : 1 }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -45,7 +45,7 @@ "meta" : { "_dd.ci.itr.tests_skipped" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -63,7 +63,7 @@ "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2}, "test.itr.tests_skipping.count" : 1 }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -78,7 +78,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -98,7 +98,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestParameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -116,7 +116,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -146,7 +146,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterized.parameterized_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -167,7 +167,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -195,7 +195,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterized.parameterized_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-skipping/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-skipping/events.ftl index 7e827553f98..422b3b18bee 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-skipping/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-skipping/events.ftl @@ -7,7 +7,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -30,7 +30,7 @@ "process_id" : ${content_metrics_process_id}, "test.itr.tests_skipping.count" : 2 }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -45,7 +45,7 @@ "meta" : { "_dd.ci.itr.tests_skipped" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -63,7 +63,7 @@ "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2}, "test.itr.tests_skipping.count" : 2 }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -78,7 +78,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -98,7 +98,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailedAndSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -116,7 +116,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -145,7 +145,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_another_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -166,7 +166,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -195,7 +195,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -216,7 +216,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -243,7 +243,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable-not-skipped/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable-not-skipped/events.ftl index 3558acc6407..d1f99bb1d38 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable-not-skipped/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable-not-skipped/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -29,7 +29,7 @@ "process_id" : ${content_metrics_process_id}, "test.itr.tests_skipping.count" : 0 }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -43,7 +43,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -61,7 +61,7 @@ "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2}, "test.itr.tests_skipping.count" : 0 }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -76,7 +76,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -96,7 +96,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceedUnskippable", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -114,7 +114,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -143,7 +143,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedUnskippable.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable-suite/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable-suite/events.ftl index 5f71a4ce72e..7c7aeee8465 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable-suite/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable-suite/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -29,7 +29,7 @@ "process_id" : ${content_metrics_process_id}, "test.itr.tests_skipping.count" : 0 }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -43,7 +43,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -61,7 +61,7 @@ "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2}, "test.itr.tests_skipping.count" : 0 }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -76,7 +76,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -97,7 +97,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceedUnskippableSuite", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -115,7 +115,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -145,7 +145,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedUnskippableSuite.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable/events.ftl index 78437a267fc..af5a875b578 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-itr-unskippable/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -29,7 +29,7 @@ "process_id" : ${content_metrics_process_id}, "test.itr.tests_skipping.count" : 0 }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -43,7 +43,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -61,7 +61,7 @@ "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2}, "test.itr.tests_skipping.count" : 0 }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -76,7 +76,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -96,7 +96,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceedUnskippable", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -114,7 +114,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -144,7 +144,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedUnskippable.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-legacy/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-legacy/events.ftl index 92e57d5e1c4..dd30cfb0dd6 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-legacy/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-legacy/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceedLegacy", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -134,7 +134,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedLegacy.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-multiple-successful-suites/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-multiple-successful-suites/events.ftl index 7250b4e4ab3..f430383c1ed 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-multiple-successful-suites/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-multiple-successful-suites/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -134,7 +134,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -153,7 +153,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -173,7 +173,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceedAndSkipped", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_5}, @@ -190,7 +190,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -218,7 +218,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedAndSkipped.test_skipped", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -238,7 +238,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -265,7 +265,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedAndSkipped.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-parameterized-junit-params/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-parameterized-junit-params/events.ftl index ee4f4df2b2a..44b36eeaedd 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-parameterized-junit-params/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-parameterized-junit-params/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestParameterizedJUnitParams", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterizedJUnitParams.test_parameterized(1, 2, 3) ", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -155,7 +155,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -183,7 +183,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterizedJUnitParams.test_parameterized(2, 2, 4) ", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-parameterized/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-parameterized/events.ftl index fde34b8d71a..fa6deac24be 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-parameterized/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestParameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterized.parameterized_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -155,7 +155,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -183,7 +183,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterized.parameterized_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-atr/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-atr/events.ftl index 7735299037c..aad8bea1746 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-atr/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-atr/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack}, @@ -139,7 +139,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -159,7 +159,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_2}, @@ -191,7 +191,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -211,7 +211,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_3}, @@ -243,7 +243,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -263,7 +263,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_4}, @@ -295,7 +295,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -315,7 +315,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_5}, @@ -348,7 +348,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-efd/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-efd/events.ftl index 55665fad7e0..213c6d68746 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-efd/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-efd/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -28,7 +28,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -42,7 +42,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -59,7 +59,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -74,7 +74,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -94,7 +94,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -111,7 +111,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack}, @@ -142,7 +142,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -162,7 +162,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_2}, @@ -195,7 +195,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -215,7 +215,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_3}, @@ -249,7 +249,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-known/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-known/events.ftl index 9daaa37af8e..7d409ad2c0d 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-known/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-known/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -28,7 +28,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -42,7 +42,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -59,7 +59,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -74,7 +74,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -94,7 +94,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -111,7 +111,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack}, @@ -141,7 +141,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-parameterized/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-parameterized/events.ftl index 7b619a55bd5..c04408d2f7b 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed-parameterized/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailedParameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -141,7 +141,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterized.test_failed_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -161,7 +161,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -190,7 +190,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterized.test_failed_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed/events.ftl index f640662a917..025d821ae88 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-quarantined-failed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack}, @@ -139,7 +139,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-retry-failed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-retry-failed/events.ftl index 54ef0c228dc..172e56130b4 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-retry-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-retry-failed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack}, @@ -136,7 +136,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -156,7 +156,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_2}, @@ -187,7 +187,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -207,7 +207,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_3}, @@ -238,7 +238,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -258,7 +258,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_4}, @@ -289,7 +289,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -309,7 +309,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack_5}, @@ -341,7 +341,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-retry-parameterized/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-retry-parameterized/events.ftl index e86722f0024..e07bca9d382 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-retry-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-retry-parameterized/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailedParameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -138,7 +138,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterized.test_failed_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -158,7 +158,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -191,7 +191,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterized.test_failed_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -211,7 +211,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -244,7 +244,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterized.test_failed_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -264,7 +264,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -297,7 +297,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterized.test_failed_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -317,7 +317,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -351,7 +351,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterized.test_failed_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -371,7 +371,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -399,7 +399,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterized.test_failed_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-skipped-is-not-retried/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-skipped-is-not-retried/events.ftl index 627c97c1ca6..e7819cfce43 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-skipped-is-not-retried/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-skipped-is-not-retried/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSkipped", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSkipped.test_skipped", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-skipped/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-skipped/events.ftl index 627c97c1ca6..e7819cfce43 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-skipped/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-skipped/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSkipped", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSkipped.test_skipped", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed-impacted/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed-impacted/events.ftl index d3f0ae0144a..162972b01d1 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed-impacted/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed-impacted/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed-kotlin/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed-kotlin/events.ftl index a4497dd5338..6418003fa58 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed-kotlin/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed-kotlin/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceedKotlin", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -134,7 +134,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedKotlin.single document (without provider) deserialized from json", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed-parameterized-kotlin/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed-parameterized-kotlin/events.ftl index fd625dd73f8..9fd17137313 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed-parameterized-kotlin/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed-parameterized-kotlin/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceedParameterizedKotlin", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedParameterizedKotlin.single document (without provider) deserialized from json", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -155,7 +155,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -183,7 +183,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedParameterizedKotlin.single document (without provider) deserialized from json", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed/events.ftl index 9398aa4d35a..b25ca72bbd4 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-succeed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -134,7 +134,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-success-and-failure/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-success-and-failure/events.ftl index a840fd08a08..d1c3a0417e0 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-success-and-failure/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-success-and-failure/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailedAndSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -134,7 +134,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_another_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -154,7 +154,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack}, @@ -183,7 +183,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -203,7 +203,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -230,7 +230,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-success-and-skipped/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-success-and-skipped/events.ftl index 9f1b2dc967c..3642a69aa29 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-success-and-skipped/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-success-and-skipped/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceedAndSkipped", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedAndSkipped.test_skipped", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -155,7 +155,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -182,7 +182,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedAndSkipped.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-successful-suite-and-failing-suite/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-successful-suite-and-failing-suite/events.ftl index 56775ffe512..80acf4f7075 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-successful-suite-and-failing-suite/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-successful-suite-and-failing-suite/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailedAndSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -134,7 +134,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_another_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -154,7 +154,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.stack" : ${content_meta_error_stack}, @@ -183,7 +183,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -203,7 +203,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -230,7 +230,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -249,7 +249,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -269,7 +269,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, @@ -286,7 +286,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -313,7 +313,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-runner/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-runner/events.ftl index 777199a2a14..dad2541a054 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-runner/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-runner/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceedSuite$FirstTest", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -134,7 +134,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSuite$FirstTest.testAddition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -153,7 +153,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -173,7 +173,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestSucceedSuite$SecondTest", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_5}, @@ -190,7 +190,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -217,7 +217,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSuite$SecondTest.testSubtraction", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-setup-failure/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-setup-failure/events.ftl index 68b1a414def..ba17c451913 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-setup-failure/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-setup-failure/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 1, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -93,7 +93,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailedSuiteSetup", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-teardown-failure/events.ftl b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-teardown-failure/events.ftl index 5d0707527fe..3ab49ee78bf 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-teardown-failure/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/resources/test-suite-teardown-failure/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit4.test_session", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit4.test_module", "resource" : "junit-4.10", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 1, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -93,7 +93,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "org.example.TestFailedSuiteTearDown", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -110,7 +110,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -137,7 +137,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSuiteTearDown.test_another_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -157,7 +157,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit4", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -184,7 +184,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSuiteTearDown.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl index 34a3222784c..674f08e75bc 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -65,7 +65,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -85,7 +85,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -115,7 +115,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -135,7 +135,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -165,7 +165,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -185,7 +185,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -215,7 +215,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -235,7 +235,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -266,7 +266,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -287,7 +287,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -308,7 +308,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, @@ -322,7 +322,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -338,7 +338,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_8}, diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl index 6afe7a46e34..aba3293d6c3 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -62,7 +62,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -82,7 +82,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -109,7 +109,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -129,7 +129,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -156,7 +156,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -176,7 +176,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -203,7 +203,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -223,7 +223,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -251,7 +251,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -272,7 +272,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -293,7 +293,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, @@ -307,7 +307,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -323,7 +323,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_8}, diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-failed/events.ftl index 7def43119cf..678d4f32dea 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-failed/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -64,7 +64,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -84,7 +84,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -113,7 +113,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -133,7 +133,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -162,7 +162,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -182,7 +182,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -211,7 +211,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -231,7 +231,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -261,7 +261,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -282,7 +282,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -303,7 +303,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, @@ -317,7 +317,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -333,7 +333,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_8}, diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl index c1656d24e1f..95bc7ffd5cc 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -65,7 +65,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -85,7 +85,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -115,7 +115,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -135,7 +135,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -165,7 +165,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -185,7 +185,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -215,7 +215,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -235,7 +235,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -266,7 +266,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -287,7 +287,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -308,7 +308,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, @@ -322,7 +322,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -338,7 +338,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_8}, diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl index 1fb14382c2e..51617573d1b 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -62,7 +62,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -82,7 +82,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -109,7 +109,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -129,7 +129,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -156,7 +156,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -176,7 +176,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -203,7 +203,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -223,7 +223,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -251,7 +251,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -272,7 +272,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -293,7 +293,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, @@ -307,7 +307,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -323,7 +323,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_8}, diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-succeeded/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-succeeded/events.ftl index 6ef4f50fc5a..b754f7aead6 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-succeeded/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-succeeded/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -61,7 +61,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -81,7 +81,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -107,7 +107,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -127,7 +127,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -153,7 +153,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -173,7 +173,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -199,7 +199,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -219,7 +219,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -246,7 +246,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -267,7 +267,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -288,7 +288,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, @@ -302,7 +302,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -318,7 +318,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_8}, diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-disabled-failed/events.ftl index 1eecdb66ac7..453d4358dbc 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-disabled-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-disabled-failed/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -62,7 +62,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -83,7 +83,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -104,7 +104,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -118,7 +118,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -134,7 +134,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-known-test/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-known-test/events.ftl index 554c7fdb816..ee02b5c67b4 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-known-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-known-test/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -60,7 +60,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -81,7 +81,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -102,7 +102,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -116,7 +116,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -132,7 +132,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-5.4.0/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-5.4.0/events.ftl index cbff12a25ea..e2d2852e4ac 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-5.4.0/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-5.4.0/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -61,7 +61,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Double digits.Example #1", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -81,7 +81,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -105,7 +105,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Double digits.Example #2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -125,7 +125,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -149,7 +149,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -169,7 +169,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -195,7 +195,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -215,7 +215,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -241,7 +241,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -261,7 +261,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -285,7 +285,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -305,7 +305,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -331,7 +331,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -351,7 +351,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -377,7 +377,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -398,7 +398,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -420,7 +420,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_10}, @@ -434,7 +434,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -451,7 +451,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_11} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_11}, diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-latest/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-latest/events.ftl index 40ba8846c29..a2bfa2f4e86 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-latest/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-scenario-outline-latest/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -61,7 +61,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Double digits.Example #2.1", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -81,7 +81,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -105,7 +105,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Double digits.Example #2.2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -125,7 +125,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -149,7 +149,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1.1", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -169,7 +169,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -195,7 +195,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1.1", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -215,7 +215,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -241,7 +241,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1.1", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -261,7 +261,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -285,7 +285,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1.2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -305,7 +305,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -331,7 +331,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1.2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -351,7 +351,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -377,7 +377,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1.2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -398,7 +398,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -420,7 +420,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_10}, @@ -434,7 +434,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -451,7 +451,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_11} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_11}, diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-slow-test/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-slow-test/events.ftl index 9c86624de09..e6243c826f2 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-slow-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-slow-test/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_slow.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -61,7 +61,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_slow.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -81,7 +81,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -107,7 +107,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_slow.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -128,7 +128,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -149,7 +149,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, @@ -163,7 +163,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -179,7 +179,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_5}, diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-test/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-test/events.ftl index 77edf65c23a..ec08e23411e 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-efd-new-test/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -61,7 +61,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -81,7 +81,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -107,7 +107,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -127,7 +127,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -153,7 +153,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -174,7 +174,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -195,7 +195,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_5}, @@ -209,7 +209,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -225,7 +225,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_6}, diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-then-succeed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-then-succeed/events.ftl index 003c56eb305..bf194825718 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-then-succeed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-then-succeed/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed_then_succeed.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -63,7 +63,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed_then_succeed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -83,7 +83,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -111,7 +111,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed_then_succeed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -131,7 +131,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -156,7 +156,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed_then_succeed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -177,7 +177,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -197,7 +197,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_5}, @@ -211,7 +211,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -226,7 +226,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_6}, diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-skipping/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-skipping/events.ftl index fc457bb16e8..c53ef36671c 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-skipping/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-skipping/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -38,7 +38,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -63,7 +63,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -85,7 +85,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -108,7 +108,7 @@ "process_id" : ${content_metrics_process_id}, "test.itr.tests_skipping.count" : 1 }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -123,7 +123,7 @@ "meta" : { "_dd.ci.itr.tests_skipped" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -141,7 +141,7 @@ "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}, "test.itr.tests_skipping.count" : 1 }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable-suite/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable-suite/events.ftl index 70c04fa1ae6..f4194ef991e 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable-suite/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable-suite/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -38,7 +38,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -63,7 +63,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable_suite.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -84,7 +84,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -107,7 +107,7 @@ "process_id" : ${content_metrics_process_id}, "test.itr.tests_skipping.count" : 0 }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -121,7 +121,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -139,7 +139,7 @@ "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}, "test.itr.tests_skipping.count" : 0 }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable/events.ftl index 50367566e2d..8af33707aa2 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-itr-unskippable/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -38,7 +38,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -63,7 +63,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_unskippable.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -84,7 +84,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -107,7 +107,7 @@ "process_id" : ${content_metrics_process_id}, "test.itr.tests_skipping.count" : 0 }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -121,7 +121,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -139,7 +139,7 @@ "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}, "test.itr.tests_skipping.count" : 0 }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-no-retry-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-no-retry-failed/events.ftl index dd668874669..147a0ac1742 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-no-retry-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-no-retry-failed/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -63,7 +63,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -84,7 +84,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -104,7 +104,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -118,7 +118,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -133,7 +133,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-parallel/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-parallel/coverages.ftl index 4b612855288..8e1e6d30f80 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-parallel/coverages.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-parallel/coverages.ftl @@ -1,15 +1,15 @@ [ { "files" : [ { - "filename" : "org/example/cucumber/calculator/basic_arithmetic.feature" + "filename" : "org/example/cucumber/calculator/basic_arithmetic_skipped.feature" } ], - "span_id" : ${content_span_id}, + "span_id" : ${content_span_id_3}, "test_session_id" : ${content_test_session_id}, - "test_suite_id" : ${content_test_suite_id} + "test_suite_id" : ${content_test_suite_id_2} }, { "files" : [ { - "filename" : "org/example/cucumber/calculator/basic_arithmetic_skipped.feature" + "filename" : "org/example/cucumber/calculator/basic_arithmetic.feature" } ], - "span_id" : ${content_span_id_3}, + "span_id" : ${content_span_id}, "test_session_id" : ${content_test_session_id}, - "test_suite_id" : ${content_test_suite_id_2} + "test_suite_id" : ${content_test_suite_id} } ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-parallel/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-parallel/events.ftl index 06c83f96cc1..f524db6d76a 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-parallel/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-parallel/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -60,7 +60,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -79,7 +79,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -95,7 +95,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_skipped.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -112,7 +112,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -136,7 +136,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_skipped.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -156,7 +156,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -179,7 +179,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_skipped.feature:Basic Arithmetic.Subtraction", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -200,7 +200,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_3}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -220,7 +220,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_6}, @@ -234,7 +234,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -249,7 +249,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-atr/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-atr/events.ftl index 9d3c0c2dfa7..5b3859d02cf 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-atr/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-atr/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -64,7 +64,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -84,7 +84,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -113,7 +113,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -133,7 +133,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -162,7 +162,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -182,7 +182,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -211,7 +211,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -231,7 +231,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -261,7 +261,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -282,7 +282,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -303,7 +303,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, @@ -317,7 +317,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -333,7 +333,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_8}, diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-efd/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-efd/events.ftl index aac9b69030b..8110decaf3a 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-efd/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-efd/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -65,7 +65,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -85,7 +85,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -115,7 +115,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -135,7 +135,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -166,7 +166,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -187,7 +187,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -209,7 +209,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_5}, @@ -223,7 +223,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -240,7 +240,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_6}, diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-known/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-known/events.ftl index 6db10e84448..4240f4bb83b 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-known/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-known/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -64,7 +64,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -85,7 +85,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -107,7 +107,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -121,7 +121,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -138,7 +138,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed/events.ftl index bbb5e4373d2..49aaf589111 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -64,7 +64,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -85,7 +85,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -106,7 +106,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -120,7 +120,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -136,7 +136,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed-scenario-outline-5.4.0/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed-scenario-outline-5.4.0/events.ftl index b1c40e20884..016c03a42fc 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed-scenario-outline-5.4.0/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed-scenario-outline-5.4.0/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_failed_examples.feature:Basic Arithmetic With Examples", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -63,7 +63,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_failed_examples.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -83,7 +83,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -111,7 +111,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_failed_examples.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -131,7 +131,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -159,7 +159,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_failed_examples.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -179,7 +179,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -207,7 +207,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_failed_examples.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -227,7 +227,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -256,7 +256,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_failed_examples.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -276,7 +276,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message_2}, @@ -302,7 +302,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_failed_examples.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -323,7 +323,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -343,7 +343,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_8}, @@ -357,7 +357,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -372,7 +372,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_9} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_9}, diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed-scenario-outline-latest/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed-scenario-outline-latest/events.ftl index 6d2470d7706..2f442c71f5c 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed-scenario-outline-latest/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed-scenario-outline-latest/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_failed_examples.feature:Basic Arithmetic With Examples", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -63,7 +63,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_failed_examples.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1.1", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -83,7 +83,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -111,7 +111,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_failed_examples.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1.1", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -131,7 +131,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -159,7 +159,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_failed_examples.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1.1", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -179,7 +179,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -207,7 +207,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_failed_examples.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1.1", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -227,7 +227,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -256,7 +256,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_failed_examples.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1.1", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -276,7 +276,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message_2}, @@ -302,7 +302,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_failed_examples.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1.2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -323,7 +323,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -343,7 +343,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_8}, @@ -357,7 +357,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -372,7 +372,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_9} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_9}, diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed/events.ftl index b09a96c433a..5072bbc7707 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -63,7 +63,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -83,7 +83,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -111,7 +111,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -131,7 +131,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -159,7 +159,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -179,7 +179,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -207,7 +207,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -227,7 +227,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -256,7 +256,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -277,7 +277,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -297,7 +297,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, @@ -311,7 +311,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -326,7 +326,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_8}, diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-5.4.0/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-5.4.0/events.ftl index d9b02595929..0cf2a7e7c73 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-5.4.0/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-5.4.0/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -60,7 +60,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Double digits.Example #1", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -80,7 +80,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -103,7 +103,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Double digits.Example #2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -123,7 +123,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -146,7 +146,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -166,7 +166,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -189,7 +189,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -210,7 +210,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -230,7 +230,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_6}, @@ -244,7 +244,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -259,7 +259,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-latest/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-latest/events.ftl index 28e3731d401..aa2857c054f 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-latest/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-scenario-outline-latest/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -60,7 +60,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Double digits.Example #2.1", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -80,7 +80,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -103,7 +103,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Double digits.Example #2.2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -123,7 +123,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -146,7 +146,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1.1", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -166,7 +166,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -189,7 +189,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1.2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -210,7 +210,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -230,7 +230,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_6}, @@ -244,7 +244,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -259,7 +259,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-feature/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-feature/events.ftl index edc22b3e060..f7bf54e2797 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-feature/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-feature/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_skipped_feature.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -61,7 +61,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_skipped_feature.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -81,7 +81,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -105,7 +105,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_skipped_feature.feature:Basic Arithmetic.Subtraction", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -126,7 +126,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -146,7 +146,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, @@ -160,7 +160,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -175,7 +175,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_5}, diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-5.4.0/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-5.4.0/events.ftl index d3d0375ad6b..5812e36f9af 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-5.4.0/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-5.4.0/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -61,7 +61,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples.Many additions.Double digits.Example #1", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -81,7 +81,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -105,7 +105,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples.Many additions.Double digits.Example #2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -125,7 +125,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -149,7 +149,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -169,7 +169,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -193,7 +193,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -214,7 +214,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -234,7 +234,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_6}, @@ -248,7 +248,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -263,7 +263,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-latest/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-latest/events.ftl index c4585150978..fa9d848fea3 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-latest/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped-scenario-outline-latest/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -61,7 +61,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples.Many additions.Double digits.Example #2.1", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -81,7 +81,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -105,7 +105,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples.Many additions.Double digits.Example #2.2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -125,7 +125,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -149,7 +149,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1.1", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -169,7 +169,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -193,7 +193,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_with_examples_skipped.feature:Basic Arithmetic With Examples.Many additions.Single digits.Example #1.2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -214,7 +214,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -234,7 +234,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_6}, @@ -248,7 +248,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -263,7 +263,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped/events.ftl index 2d20df092cf..34d55f95e6d 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-skipped/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_skipped.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -61,7 +61,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_skipped.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -81,7 +81,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -104,7 +104,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_skipped.feature:Basic Arithmetic.Subtraction", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -125,7 +125,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -145,7 +145,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, @@ -159,7 +159,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -174,7 +174,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_5}, diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-succeed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-succeed/events.ftl index 7f16287b646..242cdc36984 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-succeed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-succeed/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -20,7 +20,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -37,7 +37,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -60,7 +60,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id}, "resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -81,7 +81,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -101,7 +101,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "cucumber.test_session", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -115,7 +115,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "cucumber", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -130,7 +130,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4} }, - "name" : "junit.test_module", + "name" : "cucumber.test_module", "resource" : "cucumber-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-before-all-after-all/events.ftl b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-before-all-after-all/events.ftl index 5b7a75f2ac9..2948cb9d4f3 100644 --- a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-before-all-after-all/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-before-all-after-all/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.8", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.8", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestSucceedBeforeAllAfterAll", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedBeforeAllAfterAll.another_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -155,7 +155,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -183,7 +183,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedBeforeAllAfterAll.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-before-each-after-each/events.ftl b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-before-each-after-each/events.ftl index 6d2c5d5c95c..57a94163c2a 100644 --- a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-before-each-after-each/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-before-each-after-each/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.8", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.8", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestSucceedBeforeEachAfterEach", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedBeforeEachAfterEach.another_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -155,7 +155,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -183,7 +183,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedBeforeEachAfterEach.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-all/events.ftl b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-all/events.ftl index 42a0fcfe47d..518cecec3b7 100644 --- a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-all/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-all/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.8", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.8", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 1, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -93,7 +93,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestFailedAfterAll", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -110,7 +110,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -138,7 +138,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAfterAll.another_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -158,7 +158,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -186,7 +186,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAfterAll.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-each/events.ftl b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-each/events.ftl index 22f95e7c8da..ad34aaac85d 100644 --- a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-each/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-after-each/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.8", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.8", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestFailedAfterEach", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -138,7 +138,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAfterEach.another_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -158,7 +158,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -189,7 +189,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAfterEach.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-before-all/events.ftl b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-before-all/events.ftl index a66069d423b..45a8e617dc0 100644 --- a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-before-all/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-before-all/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.8", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.8", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 1, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -93,7 +93,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestFailedBeforeAll", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-before-each/events.ftl b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-before-each/events.ftl index 46bd5467bdd..565d55a924b 100644 --- a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-before-each/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/resources/test-failed-before-each/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.8", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.8", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestFailedBeforeEach", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -138,7 +138,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedBeforeEach.another_test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -158,7 +158,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -189,7 +189,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedBeforeEach.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl index 0ab49f6b112..e47391e2bfa 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -24,7 +24,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "spock.test_suite", "resource" : "org.example.TestFailedSpock", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -73,7 +73,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSpock.test failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -93,7 +93,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -127,7 +127,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSpock.test failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -147,7 +147,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -181,7 +181,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSpock.test failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -201,7 +201,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -235,7 +235,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSpock.test failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -255,7 +255,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -290,7 +290,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSpock.test failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -311,7 +311,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -332,7 +332,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "spock.test_session", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, @@ -346,7 +346,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -362,7 +362,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8} }, - "name" : "junit.test_module", + "name" : "spock.test_module", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_8}, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl index 55d39bbdbfa..bb7fa5f169e 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -24,7 +24,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "spock.test_suite", "resource" : "org.example.TestSucceedSpock", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -70,7 +70,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSpock.test success", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -90,7 +90,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -121,7 +121,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSpock.test success", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -141,7 +141,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -172,7 +172,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSpock.test success", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -192,7 +192,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -223,7 +223,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSpock.test success", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -243,7 +243,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -275,7 +275,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSpock.test success", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -296,7 +296,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -317,7 +317,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "spock.test_session", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, @@ -331,7 +331,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -347,7 +347,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8} }, - "name" : "junit.test_module", + "name" : "spock.test_module", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_8}, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-failed/events.ftl index f720e450fa3..e778923fe35 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-failed/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -24,7 +24,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "spock.test_suite", "resource" : "org.example.TestFailedSpock", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -72,7 +72,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSpock.test failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -92,7 +92,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -125,7 +125,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSpock.test failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -145,7 +145,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -178,7 +178,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSpock.test failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -198,7 +198,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -231,7 +231,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSpock.test failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -251,7 +251,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -285,7 +285,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSpock.test failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -306,7 +306,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -327,7 +327,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "spock.test_session", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, @@ -341,7 +341,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -357,7 +357,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8} }, - "name" : "junit.test_module", + "name" : "spock.test_module", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_8}, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl index 3eaa5d43904..df4e664f472 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -24,7 +24,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "spock.test_suite", "resource" : "org.example.TestFailedSpock", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -73,7 +73,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSpock.test failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -93,7 +93,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -127,7 +127,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSpock.test failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -147,7 +147,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -181,7 +181,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSpock.test failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -201,7 +201,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -235,7 +235,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSpock.test failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -255,7 +255,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -290,7 +290,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSpock.test failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -311,7 +311,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -332,7 +332,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "spock.test_session", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, @@ -346,7 +346,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -362,7 +362,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8} }, - "name" : "junit.test_module", + "name" : "spock.test_module", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_8}, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl index e011c63a696..e6cc7576407 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -24,7 +24,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "spock.test_suite", "resource" : "org.example.TestSucceedSpock", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -70,7 +70,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSpock.test success", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -90,7 +90,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -121,7 +121,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSpock.test success", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -141,7 +141,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -172,7 +172,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSpock.test success", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -192,7 +192,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -223,7 +223,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSpock.test success", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -243,7 +243,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -275,7 +275,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSpock.test success", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -296,7 +296,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -317,7 +317,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "spock.test_session", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, @@ -331,7 +331,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -347,7 +347,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8} }, - "name" : "junit.test_module", + "name" : "spock.test_module", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_8}, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-succeeded/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-succeeded/events.ftl index 66fff178d2f..1a2832d72a6 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-succeeded/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-attempt-to-fix-succeeded/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -24,7 +24,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "spock.test_suite", "resource" : "org.example.TestSucceedSpock", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -69,7 +69,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSpock.test success", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -89,7 +89,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -119,7 +119,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSpock.test success", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -139,7 +139,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -169,7 +169,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSpock.test success", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -189,7 +189,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -219,7 +219,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSpock.test success", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -239,7 +239,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -270,7 +270,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSpock.test success", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -291,7 +291,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -312,7 +312,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "spock.test_session", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, @@ -326,7 +326,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -342,7 +342,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8} }, - "name" : "junit.test_module", + "name" : "spock.test_module", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_8}, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-disabled-failed-parameterized/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-disabled-failed-parameterized/events.ftl index 1e5013b9858..2e1d0cdf2f7 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-disabled-failed-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-disabled-failed-parameterized/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -24,7 +24,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "spock.test_suite", "resource" : "org.example.TestFailedParameterizedSpock", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -69,7 +69,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterizedSpock.test add 1 and 2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -89,7 +89,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -119,7 +119,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterizedSpock.test add 4 and 4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -140,7 +140,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -161,7 +161,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "spock.test_session", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, @@ -175,7 +175,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -191,7 +191,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5} }, - "name" : "junit.test_module", + "name" : "spock.test_module", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_5}, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-disabled-failed/events.ftl index 1839256d0cb..4d6f3c23b42 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-disabled-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-disabled-failed/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -25,7 +25,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "spock.test_suite", "resource" : "org.example.TestFailedSpock", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -42,7 +42,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -71,7 +71,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSpock.test failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -92,7 +92,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -113,7 +113,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "spock.test_session", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -127,7 +127,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -143,7 +143,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4} }, - "name" : "junit.test_module", + "name" : "spock.test_module", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-faulty-session-threshold/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-faulty-session-threshold/events.ftl index 53653b19bc6..f2eef966c0c 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-faulty-session-threshold/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-faulty-session-threshold/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -24,7 +24,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "spock.test_suite", "resource" : "org.example.TestSucceedAndFailedSpock", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -69,7 +69,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedAndFailedSpock.test another success", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -89,7 +89,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -120,7 +120,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedAndFailedSpock.test failure", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -140,7 +140,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -173,7 +173,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedAndFailedSpock.test failure", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -193,7 +193,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -227,7 +227,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedAndFailedSpock.test failure", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -247,7 +247,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -275,7 +275,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedAndFailedSpock.test success", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -295,7 +295,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -325,7 +325,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedAndFailedSpock.test success", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -345,7 +345,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -375,7 +375,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedAndFailedSpock.test success", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -396,7 +396,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -418,7 +418,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "spock.test_session", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_9}, @@ -432,7 +432,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -449,7 +449,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_10} }, - "name" : "junit.test_module", + "name" : "spock.test_module", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_10}, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-parameterized-test/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-parameterized-test/events.ftl index 3adcb43e9a6..faa8cf6c1f1 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-parameterized-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-parameterized-test/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -24,7 +24,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "spock.test_suite", "resource" : "org.example.TestParameterizedSpock", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -69,7 +69,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterizedSpock.test add 1 and 2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -89,7 +89,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -117,7 +117,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterizedSpock.test add 4 and 4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -138,7 +138,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -159,7 +159,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "spock.test_session", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, @@ -173,7 +173,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -189,7 +189,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5} }, - "name" : "junit.test_module", + "name" : "spock.test_module", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_5}, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-test/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-test/events.ftl index 942de5aba7f..9b218b81c94 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-test/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -24,7 +24,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "spock.test_suite", "resource" : "org.example.TestSucceedSpock", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -68,7 +68,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSpock.test success", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -89,7 +89,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -110,7 +110,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "spock.test_session", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -124,7 +124,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -140,7 +140,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4} }, - "name" : "junit.test_module", + "name" : "spock.test_module", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-tests-and-new-test/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-tests-and-new-test/events.ftl index cdb22de17df..81abbcb4133 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-tests-and-new-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-known-tests-and-new-test/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -24,7 +24,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "spock.test_suite", "resource" : "org.example.TestParameterizedSpock", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -69,7 +69,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterizedSpock.test add 1 and 2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -89,7 +89,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -118,7 +118,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterizedSpock.test add 4 and 4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -138,7 +138,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -169,7 +169,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterizedSpock.test add 4 and 4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -189,7 +189,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -220,7 +220,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterizedSpock.test add 4 and 4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -241,7 +241,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -262,7 +262,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "spock.test_session", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_6}, @@ -276,7 +276,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -292,7 +292,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7} }, - "name" : "junit.test_module", + "name" : "spock.test_module", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-parameterized-test/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-parameterized-test/events.ftl index 9febaa7661e..deca3bb94d9 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-parameterized-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-parameterized-test/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -24,7 +24,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "spock.test_suite", "resource" : "org.example.TestParameterizedSpock", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -70,7 +70,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterizedSpock.test add 1 and 2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -90,7 +90,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -121,7 +121,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterizedSpock.test add 1 and 2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -141,7 +141,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -172,7 +172,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterizedSpock.test add 1 and 2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -192,7 +192,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -221,7 +221,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterizedSpock.test add 4 and 4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -241,7 +241,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -272,7 +272,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterizedSpock.test add 4 and 4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -292,7 +292,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -323,7 +323,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterizedSpock.test add 4 and 4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -344,7 +344,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -366,7 +366,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "spock.test_session", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_8}, @@ -380,7 +380,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -397,7 +397,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_9} }, - "name" : "junit.test_module", + "name" : "spock.test_module", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_9}, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-slow-test/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-slow-test/events.ftl index 07d124e0111..3669b47e4bf 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-slow-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-slow-test/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -24,7 +24,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "spock.test_suite", "resource" : "org.example.TestSucceedSpockSlow", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -69,7 +69,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSpockSlow.test success", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -89,7 +89,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -119,7 +119,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSpockSlow.test success", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -140,7 +140,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -161,7 +161,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "spock.test_session", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, @@ -175,7 +175,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -191,7 +191,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5} }, - "name" : "junit.test_module", + "name" : "spock.test_module", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_5}, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-test/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-test/events.ftl index ffe0cd611f5..433b4acfd1a 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-test/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -24,7 +24,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "spock.test_suite", "resource" : "org.example.TestSucceedSpock", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -69,7 +69,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSpock.test success", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -89,7 +89,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -119,7 +119,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSpock.test success", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -139,7 +139,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -169,7 +169,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSpock.test success", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -190,7 +190,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -211,7 +211,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "spock.test_session", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_5}, @@ -225,7 +225,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -241,7 +241,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6} }, - "name" : "junit.test_module", + "name" : "spock.test_module", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_6}, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-very-slow-test/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-very-slow-test/events.ftl index b0b4091d714..e48d012ae84 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-very-slow-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-efd-new-very-slow-test/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -24,7 +24,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "spock.test_suite", "resource" : "org.example.TestSucceedSpockVerySlow", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -69,7 +69,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSpockVerySlow.test success", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -90,7 +90,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -111,7 +111,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "spock.test_session", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -125,7 +125,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -141,7 +141,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4} }, - "name" : "junit.test_module", + "name" : "spock.test_module", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-failed-then-succeed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-failed-then-succeed/events.ftl index 7a8a09d7455..2c8a5a3eeb5 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-failed-then-succeed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-failed-then-succeed/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -24,7 +24,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "spock.test_suite", "resource" : "org.example.TestFailedThenSucceedSpock", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -71,7 +71,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedThenSucceedSpock.test failed then succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -91,7 +91,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message_2}, @@ -123,7 +123,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedThenSucceedSpock.test failed then succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -143,7 +143,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message_3}, @@ -175,7 +175,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedThenSucceedSpock.test failed then succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -195,7 +195,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -224,7 +224,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedThenSucceedSpock.test failed then succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -245,7 +245,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -265,7 +265,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "spock.test_session", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_6}, @@ -279,7 +279,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -294,7 +294,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7} }, - "name" : "junit.test_module", + "name" : "spock.test_module", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-failed/events.ftl index 84ce122f100..ab4dfff612f 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-failed/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -24,7 +24,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "spock.test_suite", "resource" : "org.example.TestFailedSpock", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -71,7 +71,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSpock.test failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -92,7 +92,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -112,7 +112,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "spock.test_session", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -126,7 +126,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -141,7 +141,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4} }, - "name" : "junit.test_module", + "name" : "spock.test_module", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-not-skipping-parameterized-spec-setup/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-not-skipping-parameterized-spec-setup/events.ftl index f9a5b184a06..9b0c4becdbe 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-not-skipping-parameterized-spec-setup/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-not-skipping-parameterized-spec-setup/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -24,7 +24,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "spock.test_suite", "resource" : "org.example.TestParameterizedSetupSpecSpock", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -42,7 +42,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -72,7 +72,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterizedSetupSpecSpock.test add 1 and 2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -93,7 +93,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -121,7 +121,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterizedSetupSpecSpock.test add 4 and 4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -163,7 +163,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_3}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -186,7 +186,7 @@ "process_id" : ${content_metrics_process_id}, "test.itr.tests_skipping.count" : 1 }, - "name" : "junit.test_session", + "name" : "spock.test_session", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_5}, @@ -201,7 +201,7 @@ "meta" : { "_dd.ci.itr.tests_skipped" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid_4}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -219,7 +219,7 @@ "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5}, "test.itr.tests_skipping.count" : 1 }, - "name" : "junit.test_module", + "name" : "spock.test_module", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_6}, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-not-skipping-spec-setup/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-not-skipping-spec-setup/events.ftl index e896c6521ca..c78c1f6c0ff 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-not-skipping-spec-setup/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-not-skipping-spec-setup/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -24,7 +24,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "spock.test_suite", "resource" : "org.example.TestSucceedSetupSpecSpock", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -42,7 +42,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -69,7 +69,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSetupSpecSpock.test another success", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -90,7 +90,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -119,7 +119,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSetupSpecSpock.test success", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -161,7 +161,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_3}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -184,7 +184,7 @@ "process_id" : ${content_metrics_process_id}, "test.itr.tests_skipping.count" : 1 }, - "name" : "junit.test_session", + "name" : "spock.test_session", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_5}, @@ -199,7 +199,7 @@ "meta" : { "_dd.ci.itr.tests_skipped" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid_4}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -217,7 +217,7 @@ "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5}, "test.itr.tests_skipping.count" : 1 }, - "name" : "junit.test_module", + "name" : "spock.test_module", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_6}, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-parameterized/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-parameterized/events.ftl index 9931463d676..00bd02630a3 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-parameterized/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -24,7 +24,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "spock.test_suite", "resource" : "org.example.TestParameterizedSpock", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -42,7 +42,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -72,7 +72,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterizedSpock.test add 1 and 2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -93,7 +93,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -121,7 +121,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterizedSpock.test add 4 and 4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -143,7 +143,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -166,7 +166,7 @@ "process_id" : ${content_metrics_process_id}, "test.itr.tests_skipping.count" : 1 }, - "name" : "junit.test_session", + "name" : "spock.test_session", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, @@ -181,7 +181,7 @@ "meta" : { "_dd.ci.itr.tests_skipped" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -199,7 +199,7 @@ "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5}, "test.itr.tests_skipping.count" : 1 }, - "name" : "junit.test_module", + "name" : "spock.test_module", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_5}, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-spec-setup/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-spec-setup/events.ftl index d9e1bc83f10..250634846da 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-spec-setup/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping-spec-setup/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -25,7 +25,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "spock.test_suite", "resource" : "org.example.TestSucceedSetupSpecSpock", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -43,7 +43,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -72,7 +72,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSetupSpecSpock.test another success", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -93,7 +93,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -122,7 +122,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSetupSpecSpock.test success", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -144,7 +144,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -167,7 +167,7 @@ "process_id" : ${content_metrics_process_id}, "test.itr.tests_skipping.count" : 2 }, - "name" : "junit.test_session", + "name" : "spock.test_session", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, @@ -182,7 +182,7 @@ "meta" : { "_dd.ci.itr.tests_skipped" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -200,7 +200,7 @@ "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5}, "test.itr.tests_skipping.count" : 2 }, - "name" : "junit.test_module", + "name" : "spock.test_module", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_5}, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping/events.ftl index c7fcdbd7b39..8ecce66f16d 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-skipping/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -25,7 +25,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "spock.test_suite", "resource" : "org.example.TestSucceedSpock", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -43,7 +43,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -72,7 +72,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSpock.test success", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -94,7 +94,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -117,7 +117,7 @@ "process_id" : ${content_metrics_process_id}, "test.itr.tests_skipping.count" : 1 }, - "name" : "junit.test_session", + "name" : "spock.test_session", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -132,7 +132,7 @@ "meta" : { "_dd.ci.itr.tests_skipped" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -150,7 +150,7 @@ "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}, "test.itr.tests_skipping.count" : 1 }, - "name" : "junit.test_module", + "name" : "spock.test_module", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable-suite/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable-suite/events.ftl index 97d2fe32a77..e349a43c230 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable-suite/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable-suite/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -24,7 +24,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "spock.test_suite", "resource" : "org.example.TestSucceedSpockUnskippableSuite", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -42,7 +42,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -72,7 +72,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSpockUnskippableSuite.test success", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -93,7 +93,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -116,7 +116,7 @@ "process_id" : ${content_metrics_process_id}, "test.itr.tests_skipping.count" : 0 }, - "name" : "junit.test_session", + "name" : "spock.test_session", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -130,7 +130,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -148,7 +148,7 @@ "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}, "test.itr.tests_skipping.count" : 0 }, - "name" : "junit.test_module", + "name" : "spock.test_module", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable/events.ftl index ebfdb0327a2..73404272a8b 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-itr-unskippable/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -24,7 +24,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "spock.test_suite", "resource" : "org.example.TestSucceedSpockUnskippable", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -42,7 +42,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -72,7 +72,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSpockUnskippable.test success", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -93,7 +93,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -116,7 +116,7 @@ "process_id" : ${content_metrics_process_id}, "test.itr.tests_skipping.count" : 0 }, - "name" : "junit.test_session", + "name" : "spock.test_session", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -130,7 +130,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -148,7 +148,7 @@ "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}, "test.itr.tests_skipping.count" : 0 }, - "name" : "junit.test_module", + "name" : "spock.test_module", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-parameterized-failed-then-succeed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-parameterized-failed-then-succeed/events.ftl index f3e18f05367..3ee48fc5baf 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-parameterized-failed-then-succeed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-parameterized-failed-then-succeed/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -24,7 +24,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "spock.test_suite", "resource" : "org.example.TestFailedThenSucceedParameterizedSpock", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -72,7 +72,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedThenSucceedParameterizedSpock.test add 1 and 2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -92,7 +92,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message_2}, @@ -125,7 +125,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedThenSucceedParameterizedSpock.test add 1 and 2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -145,7 +145,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -175,7 +175,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedThenSucceedParameterizedSpock.test add 1 and 2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -195,7 +195,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -223,7 +223,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedThenSucceedParameterizedSpock.test add 4 and 4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -244,7 +244,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -264,7 +264,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "spock.test_session", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_6}, @@ -278,7 +278,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -293,7 +293,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_7} }, - "name" : "junit.test_module", + "name" : "spock.test_module", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-atr/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-atr/events.ftl index 2055dc5a541..92ba76ddb98 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-atr/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-atr/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -24,7 +24,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "spock.test_suite", "resource" : "org.example.TestFailedSpock", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -72,7 +72,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSpock.test failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -92,7 +92,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -125,7 +125,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSpock.test failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -145,7 +145,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -178,7 +178,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSpock.test failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -198,7 +198,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -231,7 +231,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSpock.test failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -251,7 +251,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -285,7 +285,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSpock.test failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -306,7 +306,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -327,7 +327,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "spock.test_session", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, @@ -341,7 +341,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -357,7 +357,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8} }, - "name" : "junit.test_module", + "name" : "spock.test_module", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_8}, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-efd/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-efd/events.ftl index a2690cc3948..c0b8a9f1c28 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-efd/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-efd/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -24,7 +24,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "spock.test_suite", "resource" : "org.example.TestFailedSpock", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -73,7 +73,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSpock.test failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -93,7 +93,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -127,7 +127,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSpock.test failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -147,7 +147,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -182,7 +182,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSpock.test failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -203,7 +203,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -225,7 +225,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "spock.test_session", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_5}, @@ -239,7 +239,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -256,7 +256,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_6} }, - "name" : "junit.test_module", + "name" : "spock.test_module", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_6}, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-known/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-known/events.ftl index eb8ffdc0dc6..aa93a974bd0 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-known/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-known/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -24,7 +24,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "spock.test_suite", "resource" : "org.example.TestFailedSpock", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -72,7 +72,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSpock.test failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -93,7 +93,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -115,7 +115,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "spock.test_session", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -129,7 +129,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -146,7 +146,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4} }, - "name" : "junit.test_module", + "name" : "spock.test_module", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-parameterized/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-parameterized/events.ftl index 377165d01bb..0c996f37685 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed-parameterized/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -24,7 +24,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "spock.test_suite", "resource" : "org.example.TestFailedParameterizedSpock", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -69,7 +69,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterizedSpock.test add 1 and 2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -89,7 +89,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -121,7 +121,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterizedSpock.test add 4 and 4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -142,7 +142,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -163,7 +163,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "spock.test_session", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, @@ -177,7 +177,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -193,7 +193,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5} }, - "name" : "junit.test_module", + "name" : "spock.test_module", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_5}, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed/events.ftl index 8f7f343f202..669be20b0e8 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-quarantined-failed/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -24,7 +24,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "spock.test_suite", "resource" : "org.example.TestFailedSpock", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -72,7 +72,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSpock.test failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -93,7 +93,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -114,7 +114,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "spock.test_session", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -128,7 +128,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -144,7 +144,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4} }, - "name" : "junit.test_module", + "name" : "spock.test_module", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-retry-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-retry-failed/events.ftl index 6450f0ea8ae..a216474383b 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-retry-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-retry-failed/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -24,7 +24,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "spock.test_suite", "resource" : "org.example.TestFailedSpock", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -71,7 +71,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSpock.test failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -91,7 +91,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -123,7 +123,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSpock.test failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -143,7 +143,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -175,7 +175,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSpock.test failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -195,7 +195,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -227,7 +227,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSpock.test failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -247,7 +247,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -280,7 +280,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSpock.test failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -301,7 +301,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -321,7 +321,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "spock.test_session", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, @@ -335,7 +335,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -350,7 +350,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_8} }, - "name" : "junit.test_module", + "name" : "spock.test_module", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_8}, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-retry-parameterized/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-retry-parameterized/events.ftl index 2339e2ab3b4..c02c03b8f88 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-retry-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-retry-parameterized/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -24,7 +24,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "spock.test_suite", "resource" : "org.example.TestFailedParameterizedSpock", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -69,7 +69,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterizedSpock.test add 1 and 2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -89,7 +89,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -120,7 +120,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterizedSpock.test add 4 and 4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -140,7 +140,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -173,7 +173,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterizedSpock.test add 4 and 4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -193,7 +193,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -226,7 +226,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterizedSpock.test add 4 and 4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -246,7 +246,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -279,7 +279,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterizedSpock.test add 4 and 4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -299,7 +299,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -333,7 +333,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterizedSpock.test add 4 and 4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -354,7 +354,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -374,7 +374,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "spock.test_session", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_8}, @@ -388,7 +388,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -403,7 +403,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_9} }, - "name" : "junit.test_module", + "name" : "spock.test_module", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_9}, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed-impacted/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed-impacted/events.ftl index f01c1e4810f..05c048b2bcb 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed-impacted/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed-impacted/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -24,7 +24,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "spock.test_suite", "resource" : "org.example.TestSucceedSpock", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -69,7 +69,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSpock.test success", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -90,7 +90,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -110,7 +110,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "spock.test_session", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -124,7 +124,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -139,7 +139,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4} }, - "name" : "junit.test_module", + "name" : "spock.test_module", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed-parameterized/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed-parameterized/events.ftl index c7787bca513..47790028da4 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed-parameterized/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -24,7 +24,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "spock.test_suite", "resource" : "org.example.TestParameterizedSpock", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -69,7 +69,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterizedSpock.test add 1 and 2", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -89,7 +89,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -117,7 +117,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterizedSpock.test add 4 and 4", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -138,7 +138,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -158,7 +158,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "spock.test_session", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, @@ -172,7 +172,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -187,7 +187,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5} }, - "name" : "junit.test_module", + "name" : "spock.test_module", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_5}, diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed/events.ftl index fc90e7755ee..6984a0c4138 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-succeed/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -24,7 +24,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "spock.test_suite", "resource" : "org.example.TestSucceedSpock", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -68,7 +68,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSpock.test success", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -89,7 +89,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -109,7 +109,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "spock.test_session", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -123,7 +123,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "spock", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -138,7 +138,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4} }, - "name" : "junit.test_module", + "name" : "spock.test_module", "resource" : "spock-junit-5", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-failed-legacy/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-failed-legacy/events.ftl index b3b7eac9be2..4bb0d3d6e19 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-failed-legacy/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-failed-legacy/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestAssumptionLegacy", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestAssumptionLegacy.test_fail_assumption_legacy", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-failed/events.ftl index 89379f861ca..ff173289a4f 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-failed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestAssumption", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestAssumption.test_fail_assumption", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-is-not-retried/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-is-not-retried/events.ftl index 89379f861ca..ff173289a4f 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-is-not-retried/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-assumption-is-not-retried/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestAssumption", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestAssumption.test_fail_assumption", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl index 38091cd92b4..58eadd19064 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestFailed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -141,7 +141,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -161,7 +161,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -195,7 +195,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -215,7 +215,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -249,7 +249,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -269,7 +269,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -303,7 +303,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -323,7 +323,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -358,7 +358,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl index 41d9b3570f9..0badcdcc1b2 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-disabled-succeeded/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -138,7 +138,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -158,7 +158,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -189,7 +189,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -209,7 +209,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -240,7 +240,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -260,7 +260,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -291,7 +291,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -311,7 +311,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -343,7 +343,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-failed/events.ftl index 8ea08257292..b6f3db653c7 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-failed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestFailed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -140,7 +140,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -160,7 +160,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -193,7 +193,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -213,7 +213,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -246,7 +246,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -266,7 +266,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -299,7 +299,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -319,7 +319,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -353,7 +353,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl index 65607f50ccf..af37ee201ca 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestFailed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -141,7 +141,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -161,7 +161,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -195,7 +195,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -215,7 +215,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -249,7 +249,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -269,7 +269,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -303,7 +303,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -323,7 +323,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -358,7 +358,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl index 825944be8a2..3117f74a228 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-quarantined-succeeded/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -138,7 +138,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -158,7 +158,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -189,7 +189,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -209,7 +209,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -240,7 +240,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -260,7 +260,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -291,7 +291,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -311,7 +311,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -343,7 +343,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-succeeded/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-succeeded/events.ftl index 75dc04b4f82..125ce543d50 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-succeeded/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-attempt-to-fix-succeeded/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -137,7 +137,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -157,7 +157,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -187,7 +187,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -207,7 +207,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -237,7 +237,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -257,7 +257,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -287,7 +287,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -307,7 +307,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -338,7 +338,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-categories/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-categories/events.ftl index f7a9519fe89..39244b4e8b8 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-categories/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-categories/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -91,7 +91,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestSucceedWithCategories", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -108,7 +108,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -136,7 +136,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedWithCategories.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-disabled-failed-parameterized/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-disabled-failed-parameterized/events.ftl index 9154f5df50f..a22c1e73dae 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-disabled-failed-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-disabled-failed-parameterized/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestFailedParameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -139,7 +139,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterized.test_failed_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-disabled-failed/events.ftl index 65c6c242b85..95b924369c4 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-disabled-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-disabled-failed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestFailed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -138,7 +138,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-faulty-session-threshold/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-faulty-session-threshold/events.ftl index f79c95d1faa..dee6ddcfddf 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-faulty-session-threshold/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-faulty-session-threshold/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -28,7 +28,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -42,7 +42,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -59,7 +59,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -74,7 +74,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -94,7 +94,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestFailedAndSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -111,7 +111,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -139,7 +139,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_another_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -159,7 +159,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -189,7 +189,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_another_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -209,7 +209,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -239,7 +239,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_another_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -259,7 +259,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -290,7 +290,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -310,7 +310,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -343,7 +343,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -363,7 +363,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -397,7 +397,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -417,7 +417,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -445,7 +445,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-parameterized-test/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-parameterized-test/events.ftl index 3d28aa281d5..f1e9848967c 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-parameterized-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-parameterized-test/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestParameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -137,7 +137,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterized.test_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -157,7 +157,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -185,7 +185,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterized.test_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-test/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-test/events.ftl index 64265a6c8a3..70816f67925 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-test/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -136,7 +136,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-tests-and-new-test/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-tests-and-new-test/events.ftl index 83e962c7cc4..a06d80c51e7 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-tests-and-new-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-known-tests-and-new-test/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestFailedAndSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -137,7 +137,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_another_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -157,7 +157,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -187,7 +187,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_another_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -207,7 +207,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -237,7 +237,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_another_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -257,7 +257,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -287,7 +287,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -307,7 +307,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -334,7 +334,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-parameterized-test/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-parameterized-test/events.ftl index 3b9cabb13be..07803834634 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-parameterized-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-parameterized-test/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -28,7 +28,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -42,7 +42,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -59,7 +59,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -74,7 +74,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -94,7 +94,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestParameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -111,7 +111,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -140,7 +140,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterized.test_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -160,7 +160,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -191,7 +191,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterized.test_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -211,7 +211,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -242,7 +242,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterized.test_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -262,7 +262,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -291,7 +291,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterized.test_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -311,7 +311,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -342,7 +342,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterized.test_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -362,7 +362,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -393,7 +393,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterized.test_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-slow-test/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-slow-test/events.ftl index 38b620e46ca..6b1ff05bd57 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-slow-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-slow-test/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestSucceedSlow", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -137,7 +137,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSlow.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -157,7 +157,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -187,7 +187,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSlow.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-test/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-test/events.ftl index e89d5033b24..89d13b59628 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-test/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -137,7 +137,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -157,7 +157,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -187,7 +187,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -207,7 +207,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -237,7 +237,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-very-slow-test/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-very-slow-test/events.ftl index 1948a83d561..698a289e6f5 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-very-slow-test/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-efd-new-very-slow-test/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestSucceedVerySlow", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -137,7 +137,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedVerySlow.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-error/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-error/events.ftl index c970a302502..7645afebaa6 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-error/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-error/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestError", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -137,7 +137,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestError.test_error", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-expected-exception-is-not-retried/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-expected-exception-is-not-retried/events.ftl index b855e70d107..0bd7b362ec7 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-expected-exception-is-not-retried/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-expected-exception-is-not-retried/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestSucceedExpectedException", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -134,7 +134,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedExpectedException.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-factory/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-factory/events.ftl index 394ae5dec44..82eafc7d6e3 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-factory/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-factory/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestFactory", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -134,7 +134,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFactory.test_factory", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -154,7 +154,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -181,7 +181,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFactory.test_factory", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-failed-then-succeed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-failed-then-succeed/events.ftl index 3e1299a12be..1cf01c08330 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-failed-then-succeed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-failed-then-succeed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestFailedThenSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -137,7 +137,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedThenSucceed.test_failed_then_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -157,7 +157,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -189,7 +189,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedThenSucceed.test_failed_then_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -209,7 +209,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -241,7 +241,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedThenSucceed.test_failed_then_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -261,7 +261,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -290,7 +290,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedThenSucceed.test_failed_then_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-failed/events.ftl index 7c2c2feca53..4a7f01bba67 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-failed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestFailed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -137,7 +137,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-inheritance/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-inheritance/events.ftl index 29eb94ebbf1..27cdcbe7356 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-inheritance/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-inheritance/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestInheritance", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -134,7 +134,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestInheritance.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping-parametrized/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping-parametrized/events.ftl index ac6c2e94a43..ffb0ef5d86a 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping-parametrized/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping-parametrized/events.ftl @@ -7,7 +7,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -30,7 +30,7 @@ "process_id" : ${content_metrics_process_id}, "test.itr.tests_skipping.count" : 1 }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -45,7 +45,7 @@ "meta" : { "_dd.ci.itr.tests_skipped" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -63,7 +63,7 @@ "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2}, "test.itr.tests_skipping.count" : 1 }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -78,7 +78,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -98,7 +98,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestParameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -116,7 +116,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -146,7 +146,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterized.test_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -167,7 +167,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -195,7 +195,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterized.test_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping/events.ftl index ae30335e16f..93c7ce58a03 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-skipping/events.ftl @@ -7,7 +7,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -30,7 +30,7 @@ "process_id" : ${content_metrics_process_id}, "test.itr.tests_skipping.count" : 2 }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -45,7 +45,7 @@ "meta" : { "_dd.ci.itr.tests_skipped" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -63,7 +63,7 @@ "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2}, "test.itr.tests_skipping.count" : 2 }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -78,7 +78,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -98,7 +98,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestFailedAndSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -116,7 +116,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -145,7 +145,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_another_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -166,7 +166,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -195,7 +195,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -216,7 +216,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -243,7 +243,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable-not-skipped/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable-not-skipped/events.ftl index e8093a24de8..3c2ac768650 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable-not-skipped/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable-not-skipped/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -29,7 +29,7 @@ "process_id" : ${content_metrics_process_id}, "test.itr.tests_skipping.count" : 0 }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -43,7 +43,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -61,7 +61,7 @@ "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2}, "test.itr.tests_skipping.count" : 0 }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -76,7 +76,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -96,7 +96,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestSucceedUnskippable", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -114,7 +114,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -143,7 +143,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedUnskippable.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable-suite/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable-suite/events.ftl index d12b9f79a28..e6912e05192 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable-suite/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable-suite/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -29,7 +29,7 @@ "process_id" : ${content_metrics_process_id}, "test.itr.tests_skipping.count" : 0 }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -43,7 +43,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -61,7 +61,7 @@ "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2}, "test.itr.tests_skipping.count" : 0 }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -76,7 +76,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -97,7 +97,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestSucceedUnskippableSuite", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -115,7 +115,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -145,7 +145,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedUnskippableSuite.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable/events.ftl index 04a65630b83..30de0206ea2 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-itr-unskippable/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -29,7 +29,7 @@ "process_id" : ${content_metrics_process_id}, "test.itr.tests_skipping.count" : 0 }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -43,7 +43,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -61,7 +61,7 @@ "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2}, "test.itr.tests_skipping.count" : 0 }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -76,7 +76,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -96,7 +96,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestSucceedUnskippable", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -114,7 +114,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -144,7 +144,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedUnskippable.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-parameterized/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-parameterized/events.ftl index b31c8deaf7a..4fd13c32544 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-parameterized/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestParameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterized.test_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -155,7 +155,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -183,7 +183,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestParameterized.test_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-atr/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-atr/events.ftl index fc217cf84b1..e1a5b7257ab 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-atr/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-atr/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestFailed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -140,7 +140,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -160,7 +160,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -193,7 +193,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -213,7 +213,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -246,7 +246,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -266,7 +266,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -299,7 +299,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -319,7 +319,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -353,7 +353,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-efd/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-efd/events.ftl index 699fd078c02..84deb75c7f4 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-efd/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-efd/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -28,7 +28,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -42,7 +42,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -59,7 +59,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -74,7 +74,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -94,7 +94,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestFailed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -111,7 +111,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -143,7 +143,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -163,7 +163,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -197,7 +197,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -217,7 +217,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -252,7 +252,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-known/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-known/events.ftl index 7ef33f46b15..794781bfddf 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-known/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-known/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -28,7 +28,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -42,7 +42,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -59,7 +59,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -74,7 +74,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -94,7 +94,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestFailed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -111,7 +111,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -142,7 +142,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-parameterized/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-parameterized/events.ftl index 06fcc1510f7..a14cd5c6a8d 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed-parameterized/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestFailedParameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -141,7 +141,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterized.test_failed_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -161,7 +161,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message_2}, @@ -193,7 +193,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterized.test_failed_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed/events.ftl index a0d646a996a..a838ab81f5d 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-quarantined-failed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -27,7 +27,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -57,7 +57,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -72,7 +72,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -92,7 +92,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestFailed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -109,7 +109,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -140,7 +140,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-repeated/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-repeated/events.ftl index c3bb85d696b..fd6a99569f0 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-repeated/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-repeated/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestRepeated", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -134,7 +134,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestRepeated.test_repeated", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -154,7 +154,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -181,7 +181,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestRepeated.test_repeated", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-factory/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-factory/events.ftl index 37f65270bfb..37f574b8e35 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-factory/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-factory/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestFailedFactory", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -134,7 +134,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedFactory.test_factory", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -154,7 +154,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -184,7 +184,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedFactory.test_factory", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -204,7 +204,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -236,7 +236,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedFactory.test_factory", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -256,7 +256,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -288,7 +288,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedFactory.test_factory", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -308,7 +308,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -340,7 +340,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedFactory.test_factory", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -360,7 +360,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -393,7 +393,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedFactory.test_factory", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-failed/events.ftl index 853997bd35d..2c2c086d119 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-failed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestFailed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -137,7 +137,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -157,7 +157,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -189,7 +189,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -209,7 +209,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -241,7 +241,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -261,7 +261,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -293,7 +293,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -313,7 +313,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -346,7 +346,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-parameterized/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-parameterized/events.ftl index 8abc10811e6..f1317e99a91 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-parameterized/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestFailedParameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -138,7 +138,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterized.test_failed_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -158,7 +158,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -191,7 +191,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterized.test_failed_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -211,7 +211,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -244,7 +244,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterized.test_failed_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -264,7 +264,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -297,7 +297,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterized.test_failed_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -317,7 +317,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -351,7 +351,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterized.test_failed_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -371,7 +371,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message_2}, @@ -402,7 +402,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterized.test_failed_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -422,7 +422,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message_2}, @@ -455,7 +455,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterized.test_failed_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -475,7 +475,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message_2}, @@ -508,7 +508,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterized.test_failed_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -528,7 +528,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message_2}, @@ -561,7 +561,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterized.test_failed_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -581,7 +581,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message_2}, @@ -615,7 +615,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedParameterized.test_failed_parameterized", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-template/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-template/events.ftl index 8f0e91f9c67..ca9af531ada 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-template/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-template/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestFailedTemplate", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -138,7 +138,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedTemplate.test_template", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -158,7 +158,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -191,7 +191,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedTemplate.test_template", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -211,7 +211,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -244,7 +244,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedTemplate.test_template", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -264,7 +264,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -297,7 +297,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedTemplate.test_template", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -317,7 +317,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -351,7 +351,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedTemplate.test_template", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -371,7 +371,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -399,7 +399,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedTemplate.test_template", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-class/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-class/events.ftl index 5c96f9ebe37..715934df65f 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-class/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-class/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -91,7 +91,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestSkippedClass", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -108,7 +108,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -136,7 +136,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSkippedClass.test_case_skipped", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -156,7 +156,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -184,7 +184,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSkippedClass.test_factory_skipped", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -204,7 +204,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -233,7 +233,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSkippedClass.test_parameterized_skipped", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -253,7 +253,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -281,7 +281,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSkippedClass.test_repeated_skipped", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-is-not-retried/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-is-not-retried/events.ftl index f6d6a78403c..a1fd37bf390 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-is-not-retried/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-is-not-retried/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestSkipped", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSkipped.test_skipped", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-nested-suites/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-nested-suites/events.ftl index d9ac26ceedd..59fad1d9049 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-nested-suites/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped-nested-suites/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -91,7 +91,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestSkippedNested", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -128,7 +128,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestSkippedNested$NestedSuite", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, @@ -145,7 +145,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -173,7 +173,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSkippedNested$NestedSuite.test_succeed_nested", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -193,7 +193,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -221,7 +221,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSkippedNested.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped/events.ftl index f6d6a78403c..a1fd37bf390 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-skipped/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestSkipped", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSkipped.test_skipped", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-failed-multiple-suites/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-failed-multiple-suites/events.ftl index 750f0950755..cf4e9f5a307 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-failed-multiple-suites/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-failed-multiple-suites/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestFailedAndSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -134,7 +134,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_another_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -154,7 +154,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -184,7 +184,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -204,7 +204,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -231,7 +231,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -250,7 +250,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -270,7 +270,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_7}, @@ -287,7 +287,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -314,7 +314,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-failed/events.ftl index 9fc35d967e1..f8025eb2b89 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-failed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestFailedAndSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -134,7 +134,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_another_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -154,7 +154,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -184,7 +184,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_failed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -204,7 +204,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -231,7 +231,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedAndSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-skipped/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-skipped/events.ftl index cb3b25842c5..d10b28215b0 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-skipped/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-and-skipped/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestSucceedAndSkipped", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedAndSkipped.test_skipped", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -155,7 +155,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -182,7 +182,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedAndSkipped.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-impacted/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-impacted/events.ftl index 61fbd06bc11..3b3e8f693f2 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-impacted/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-impacted/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-multiple-suites/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-multiple-suites/events.ftl index c252df004bf..103fc1054a3 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-multiple-suites/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-multiple-suites/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -134,7 +134,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -153,7 +153,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -173,7 +173,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestSucceedAndSkipped", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_5}, @@ -190,7 +190,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -218,7 +218,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedAndSkipped.test_skipped", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -238,7 +238,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -265,7 +265,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedAndSkipped.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-nested-suites/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-nested-suites/events.ftl index 49b8f623b0a..da8d4a90a41 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-nested-suites/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed-nested-suites/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestSucceedNested", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -106,7 +106,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_4}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -126,7 +126,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestSucceedNested$NestedSuite", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, @@ -143,7 +143,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -170,7 +170,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedNested$NestedSuite.test_succeed_nested", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -190,7 +190,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -217,7 +217,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedNested.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed/events.ftl index 734ade2933c..5b1356476b0 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-succeed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -134,7 +134,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-assumption-failed-multi-test-case/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-assumption-failed-multi-test-case/events.ftl index c9461e22f89..a677e7fd34b 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-assumption-failed-multi-test-case/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-assumption-failed-multi-test-case/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestAssumptionAndSucceed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestAssumptionAndSucceed.test_fail_assumption", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -155,7 +155,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -182,7 +182,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestAssumptionAndSucceed.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-assumption-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-assumption-failed/events.ftl index eabf1934758..7f210811687 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-assumption-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-assumption-failed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -91,7 +91,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestSuiteSetUpAssumption", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -108,7 +108,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -136,7 +136,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSuiteSetUpAssumption.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-failed/events.ftl index 473c037700a..f7c9a154734 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-setup-failed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 1, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -93,7 +93,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestFailedSuiteSetup", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-teardown-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-teardown-failed/events.ftl index c1795b79dfa..64c2afe79ff 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-teardown-failed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-suite-teardown-failed/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 1, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "error.message" : ${content_meta_error_message}, @@ -93,7 +93,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestFailedSuiteTearDown", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -110,7 +110,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -137,7 +137,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSuiteTearDown.test_another_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -157,7 +157,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -184,7 +184,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestFailedSuiteTearDown.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-template/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-template/events.ftl index 65a5d16203d..a8aa575552e 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-template/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-template/events.ftl @@ -6,7 +6,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -26,7 +26,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -40,7 +40,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -55,7 +55,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "junit-5.3", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_2}, @@ -70,7 +70,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -90,7 +90,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestTemplate", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -107,7 +107,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -135,7 +135,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestTemplate.test_template", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -155,7 +155,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -183,7 +183,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestTemplate.test_template", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", From 787712542eb77934572f1535872da47136187866 Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Thu, 27 Feb 2025 11:13:08 +0100 Subject: [PATCH 11/41] update smoke test fixtures with new component string --- .../test-failed-flaky-retries/events.ftl | 24 ++++++------- .../events.ftl | 8 ++--- .../events.ftl | 8 ++--- .../resources/test-succeed-junit-5/events.ftl | 12 +++---- .../events.ftl | 12 +++---- .../events.ftl | 16 ++++----- .../coverages.ftl | 22 ++++++------ .../events.ftl | 16 ++++----- .../events.ftl | 16 ++++----- .../events.ftl | 16 ++++----- .../events.ftl | 12 +++---- .../test-succeed-old-gradle/events.ftl | 12 +++---- .../events.ftl | 24 ++++++------- .../test_successful_maven_run/events.ftl | 12 +++---- .../events.ftl | 12 +++---- .../events.ftl | 12 +++---- .../events.ftl | 8 ++--- .../events.ftl | 12 +++---- .../events.ftl | 12 +++---- .../events.ftl | 12 +++---- .../events.ftl | 36 +++++++++---------- .../events.ftl | 8 ++--- .../events.ftl | 8 ++--- .../events.ftl | 12 +++---- 24 files changed, 171 insertions(+), 171 deletions(-) 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 4381cbfb3b9..9c3aee98965 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 @@ -195,7 +195,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -224,7 +224,7 @@ "test.source.end" : 13, "test.source.start" : 7 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "datadog.smoke.TestFailed", "service" : "test-gradle-service", "start" : ${content_start_6}, @@ -243,7 +243,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "error.stack" : ${content_meta_error_stack_3}, "error.type" : "java.lang.AssertionError", @@ -276,7 +276,7 @@ "test.source.end" : 12, "test.source.start" : 9 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestFailed.test_failed", "service" : "test-gradle-service", @@ -298,7 +298,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "error.stack" : ${content_meta_error_stack_4}, "error.type" : "java.lang.AssertionError", @@ -333,7 +333,7 @@ "test.source.end" : 12, "test.source.start" : 9 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestFailed.test_failed", "service" : "test-gradle-service", @@ -355,7 +355,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "error.stack" : ${content_meta_error_stack_5}, "error.type" : "java.lang.AssertionError", @@ -390,7 +390,7 @@ "test.source.end" : 12, "test.source.start" : 9 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestFailed.test_failed", "service" : "test-gradle-service", @@ -412,7 +412,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "error.stack" : ${content_meta_error_stack_6}, "error.type" : "java.lang.AssertionError", @@ -447,7 +447,7 @@ "test.source.end" : 12, "test.source.start" : 9 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestFailed.test_failed", "service" : "test-gradle-service", @@ -469,7 +469,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "error.stack" : ${content_meta_error_stack_7}, "error.type" : "java.lang.AssertionError", @@ -505,7 +505,7 @@ "test.source.end" : 12, "test.source.start" : 9 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestFailed.test_failed", "service" : "test-gradle-service", 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 24ebe86ca3c..bd3903f8a3c 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 @@ -143,7 +143,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -172,7 +172,7 @@ "test.source.end" : 13, "test.source.start" : 7 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "datadog.smoke.TestFailed", "service" : "test-gradle-service", "start" : ${content_start_5}, @@ -191,7 +191,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "error.stack" : ${content_meta_error_stack_2}, "error.type" : "java.lang.AssertionError", @@ -224,7 +224,7 @@ "test.source.end" : 12, "test.source.start" : 9 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestFailed.test_failed", "service" : "test-gradle-service", 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 d4ec8450454..d450b99dd00 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 @@ -195,7 +195,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -224,7 +224,7 @@ "test.source.end" : 13, "test.source.start" : 7 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "datadog.smoke.TestFailed", "service" : "test-gradle-service", "start" : ${content_start_6}, @@ -243,7 +243,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "error.stack" : ${content_meta_error_stack_3}, "error.type" : "java.lang.AssertionError", @@ -276,7 +276,7 @@ "test.source.end" : 12, "test.source.start" : 9 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestFailed.test_failed", "service" : "test-gradle-service", 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 d7ccd416122..efef18567e5 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 @@ -191,7 +191,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit5", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -220,7 +220,7 @@ "test.source.end" : 18, "test.source.start" : 7 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "datadog.smoke.TestSucceed", "service" : "test-gradle-service", "start" : ${content_start_6}, @@ -239,7 +239,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit5", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -270,7 +270,7 @@ "test.source.end" : 12, "test.source.start" : 9 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestSucceed.test_succeed", "service" : "test-gradle-service", @@ -292,7 +292,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit5", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -325,7 +325,7 @@ "test.source.end" : 17, "test.source.start" : 14 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestSucceed.test_to_skip_with_itr", "service" : "test-gradle-service", 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 667146df0b8..87c1fc8b342 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 @@ -141,7 +141,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -170,7 +170,7 @@ "test.source.end" : 18, "test.source.start" : 7 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "datadog.smoke.TestSucceed", "service" : "test-gradle-service", "start" : ${content_start_5}, @@ -189,7 +189,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -220,7 +220,7 @@ "test.source.end" : 12, "test.source.start" : 9 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestSucceed.test_succeed", "service" : "test-gradle-service", @@ -242,7 +242,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -275,7 +275,7 @@ "test.source.end" : 17, "test.source.start" : 14 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestSucceed.test_to_skip_with_itr", "service" : "test-gradle-service", 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 23b60ac5d6d..fb67fceb29c 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 @@ -140,7 +140,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -169,7 +169,7 @@ "test.source.end" : 12, "test.source.start" : 7 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "datadog.smoke.TestSucceed", "service" : "test-gradle-service", "start" : ${content_start_5}, @@ -188,7 +188,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -219,7 +219,7 @@ "test.source.end" : 11, "test.source.start" : 8 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestSucceed.test_succeed", "service" : "test-gradle-service", @@ -241,7 +241,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit5", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -270,7 +270,7 @@ "test.source.end" : 12, "test.source.start" : 7 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "datadog.smoke.TestSucceedJunit5", "service" : "test-gradle-service", "start" : ${content_start_7}, @@ -289,7 +289,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit5", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -320,7 +320,7 @@ "test.source.end" : 11, "test.source.start" : 8 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestSucceedJunit5.test_succeed", "service" : "test-gradle-service", 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 2fe41431bbf..567ef02b425 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,15 +1,4 @@ [ { - "files" : [ { - "bitmap" : "gAw=", - "filename" : "src/test/java/datadog/smoke/TestSucceed.java" - }, { - "bitmap" : "IA==", - "filename" : "src/main/java/datadog/smoke/Calculator.java" - } ], - "span_id" : ${content_span_id_4}, - "test_session_id" : ${content_test_session_id}, - "test_suite_id" : ${content_test_suite_id} -}, { "files" : [ { "bitmap" : "AAE=", "filename" : "src/main/java/datadog/smoke/Calculator.java" @@ -20,4 +9,15 @@ "span_id" : ${content_span_id_5}, "test_session_id" : ${content_test_session_id}, "test_suite_id" : ${content_test_suite_id_2} +}, { + "files" : [ { + "bitmap" : "gAw=", + "filename" : "src/test/java/datadog/smoke/TestSucceed.java" + }, { + "bitmap" : "IA==", + "filename" : "src/main/java/datadog/smoke/Calculator.java" + } ], + "span_id" : ${content_span_id_4}, + "test_session_id" : ${content_test_session_id}, + "test_suite_id" : ${content_test_suite_id} } ] \ No newline at end of file diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/events.ftl index c68bd51fc40..ab6dd435cc6 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 @@ -189,7 +189,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -218,7 +218,7 @@ "test.source.end" : 12, "test.source.start" : 7 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "datadog.smoke.TestSucceed", "service" : "test-gradle-service", "start" : ${content_start_6}, @@ -237,7 +237,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -268,7 +268,7 @@ "test.source.end" : 11, "test.source.start" : 8 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestSucceed.test_succeed", "service" : "test-gradle-service", @@ -290,7 +290,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit5", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -319,7 +319,7 @@ "test.source.end" : 12, "test.source.start" : 7 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "datadog.smoke.TestSucceedJunit5", "service" : "test-gradle-service", "start" : ${content_start_8}, @@ -338,7 +338,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit5", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -369,7 +369,7 @@ "test.source.end" : 11, "test.source.start" : 8 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestSucceedJunit5.test_succeed", "service" : "test-gradle-service", 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 73e33fb9041..c261762f157 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 @@ -99,7 +99,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -128,7 +128,7 @@ "test.source.end" : 13, "test.source.start" : 7 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "datadog.smoke.TestSucceed", "service" : "test-gradle-service", "start" : ${content_start_3}, @@ -147,7 +147,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -176,7 +176,7 @@ "test.source.end" : 13, "test.source.start" : 7 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "datadog.smoke.TestSucceed", "service" : "test-gradle-service", "start" : ${content_start_4}, @@ -195,7 +195,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -226,7 +226,7 @@ "test.source.end" : 12, "test.source.start" : 9 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestSucceed.test_succeed", "service" : "test-gradle-service", @@ -248,7 +248,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -279,7 +279,7 @@ "test.source.end" : 12, "test.source.start" : 9 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestSucceed.test_succeed", "service" : "test-gradle-service", 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 fabd39e6383..4056720810b 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 @@ -148,7 +148,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -177,7 +177,7 @@ "test.source.end" : 13, "test.source.start" : 7 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "datadog.smoke.TestSucceed", "service" : "test-gradle-service", "start" : ${content_start_4}, @@ -196,7 +196,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -225,7 +225,7 @@ "test.source.end" : 13, "test.source.start" : 7 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "datadog.smoke.TestSucceed", "service" : "test-gradle-service", "start" : ${content_start_5}, @@ -244,7 +244,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -275,7 +275,7 @@ "test.source.end" : 12, "test.source.start" : 9 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestSucceed.test_succeed", "service" : "test-gradle-service", @@ -297,7 +297,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -328,7 +328,7 @@ "test.source.end" : 12, "test.source.start" : 9 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestSucceed.test_succeed", "service" : "test-gradle-service", 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 7c9a2b80b0c..736874b5af5 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 @@ -191,7 +191,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -220,7 +220,7 @@ "test.source.end" : 18, "test.source.start" : 7 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "datadog.smoke.TestSucceed", "service" : "test-gradle-service", "start" : ${content_start_6}, @@ -239,7 +239,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -270,7 +270,7 @@ "test.source.end" : 12, "test.source.start" : 9 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestSucceed.test_succeed", "service" : "test-gradle-service", @@ -292,7 +292,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -325,7 +325,7 @@ "test.source.end" : 17, "test.source.start" : 14 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestSucceed.test_to_skip_with_itr", "service" : "test-gradle-service", 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 09d5d7de93f..abf6bc9aacb 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 @@ -141,7 +141,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -170,7 +170,7 @@ "test.source.end" : 18, "test.source.start" : 7 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "datadog.smoke.TestSucceed", "service" : "test-gradle-service", "start" : ${content_start_5}, @@ -189,7 +189,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -220,7 +220,7 @@ "test.source.end" : 12, "test.source.start" : 9 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestSucceed.test_succeed", "service" : "test-gradle-service", @@ -242,7 +242,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -275,7 +275,7 @@ "test.source.end" : 17, "test.source.start" : 14 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestSucceed.test_to_skip_with_itr", "service" : "test-gradle-service", 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 beb1b2883f0..b59b5300c95 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 @@ -261,7 +261,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -290,7 +290,7 @@ "test.source.end" : 14, "test.source.start" : 7 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "datadog.smoke.TestFailed", "service" : "test-maven-service", "start" : ${content_start_8}, @@ -309,7 +309,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "error.stack" : ${content_meta_error_stack_3}, "error.type" : "java.lang.AssertionError", @@ -342,7 +342,7 @@ "test.source.end" : 12, "test.source.start" : 9 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestFailed.test_failed", "service" : "test-maven-service", @@ -364,7 +364,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "error.stack" : ${content_meta_error_stack_4}, "error.type" : "java.lang.AssertionError", @@ -399,7 +399,7 @@ "test.source.end" : 12, "test.source.start" : 9 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestFailed.test_failed", "service" : "test-maven-service", @@ -421,7 +421,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "error.stack" : ${content_meta_error_stack_5}, "error.type" : "java.lang.AssertionError", @@ -456,7 +456,7 @@ "test.source.end" : 12, "test.source.start" : 9 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestFailed.test_failed", "service" : "test-maven-service", @@ -478,7 +478,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "error.stack" : ${content_meta_error_stack_6}, "error.type" : "java.lang.AssertionError", @@ -513,7 +513,7 @@ "test.source.end" : 12, "test.source.start" : 9 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestFailed.test_failed", "service" : "test-maven-service", @@ -535,7 +535,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "error.stack" : ${content_meta_error_stack_7}, "error.type" : "java.lang.AssertionError", @@ -571,7 +571,7 @@ "test.source.end" : 12, "test.source.start" : 9 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestFailed.test_failed", "service" : "test-maven-service", 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 ea917278854..a4a29faf098 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 @@ -265,7 +265,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -294,7 +294,7 @@ "test.source.end" : 18, "test.source.start" : 7 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "datadog.smoke.TestSucceed", "service" : "test-maven-service", "start" : ${content_start_8}, @@ -313,7 +313,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -344,7 +344,7 @@ "test.source.end" : 12, "test.source.start" : 9 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestSucceed.test_succeed", "service" : "test-maven-service", @@ -366,7 +366,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -399,7 +399,7 @@ "test.source.end" : 17, "test.source.start" : 14 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestSucceed.test_to_skip_with_itr", "service" : "test-maven-service", 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 05eef47fe75..fcd2fb63f19 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 @@ -229,7 +229,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -258,7 +258,7 @@ "test.source.end" : 18, "test.source.start" : 7 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "datadog.smoke.TestSucceed", "service" : "test-maven-service", "start" : ${content_start_7}, @@ -277,7 +277,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -308,7 +308,7 @@ "test.source.end" : 12, "test.source.start" : 9 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestSucceed.test_succeed", "service" : "test-maven-service", @@ -330,7 +330,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -363,7 +363,7 @@ "test.source.end" : 17, "test.source.start" : 14 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestSucceed.test_to_skip_with_itr", "service" : "test-maven-service", diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_impacted_tests/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_impacted_tests/events.ftl index 502079cd201..fdc76099e58 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_impacted_tests/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_impacted_tests/events.ftl @@ -227,7 +227,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -256,7 +256,7 @@ "test.source.end" : 18, "test.source.start" : 7 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "datadog.smoke.TestSucceed", "service" : "test-maven-service", "start" : ${content_start_7}, @@ -275,7 +275,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -307,7 +307,7 @@ "test.source.end" : 12, "test.source.start" : 9 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestSucceed.test_succeed", "service" : "test-maven-service", @@ -329,7 +329,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -361,7 +361,7 @@ "test.source.end" : 17, "test.source.start" : 14 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestSucceed.test_to_skip_with_itr", "service" : "test-maven-service", 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 532e639cd47..b1d40342764 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 @@ -285,7 +285,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "spock", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -311,7 +311,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id_2} }, - "name" : "junit.test_suite", + "name" : "spock.test_suite", "resource" : "test_successful_maven_run_junit_platform_runner.src.test.groovy.SampleSpockTest", "service" : "test-maven-service", "start" : ${content_start_9}, @@ -330,7 +330,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "spock", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -358,7 +358,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id_2} }, - "name" : "junit.test", + "name" : "spock.test", "parent_id" : ${content_parent_id}, "resource" : "test_successful_maven_run_junit_platform_runner.src.test.groovy.SampleSpockTest.test should pass", "service" : "test-maven-service", diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/events.ftl index 0662a83efbb..8ac978d4f71 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/events.ftl @@ -265,7 +265,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit5", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -294,7 +294,7 @@ "test.source.end" : 18, "test.source.start" : 7 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "datadog.smoke.TestSucceed", "service" : "test-maven-service", "start" : ${content_start_8}, @@ -313,7 +313,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit5", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -344,7 +344,7 @@ "test.source.end" : 12, "test.source.start" : 9 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestSucceed.test_succeed", "service" : "test-maven-service", @@ -366,7 +366,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit5", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -399,7 +399,7 @@ "test.source.end" : 17, "test.source.start" : 14 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestSucceed.test_to_skip_with_itr", "service" : "test-maven-service", 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 ea917278854..a4a29faf098 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 @@ -265,7 +265,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -294,7 +294,7 @@ "test.source.end" : 18, "test.source.start" : 7 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "datadog.smoke.TestSucceed", "service" : "test-maven-service", "start" : ${content_start_8}, @@ -313,7 +313,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -344,7 +344,7 @@ "test.source.end" : 12, "test.source.start" : 9 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestSucceed.test_succeed", "service" : "test-maven-service", @@ -366,7 +366,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -399,7 +399,7 @@ "test.source.end" : 17, "test.source.start" : 14 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestSucceed.test_to_skip_with_itr", "service" : "test-maven-service", 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 ea917278854..a4a29faf098 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 @@ -265,7 +265,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -294,7 +294,7 @@ "test.source.end" : 18, "test.source.start" : 7 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "datadog.smoke.TestSucceed", "service" : "test-maven-service", "start" : ${content_start_8}, @@ -313,7 +313,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -344,7 +344,7 @@ "test.source.end" : 12, "test.source.start" : 9 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestSucceed.test_succeed", "service" : "test-maven-service", @@ -366,7 +366,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -399,7 +399,7 @@ "test.source.end" : 17, "test.source.start" : 14 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestSucceed.test_to_skip_with_itr", "service" : "test-maven-service", diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/events.ftl index 85521b4a0eb..20a78c831d7 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/events.ftl @@ -229,7 +229,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -258,7 +258,7 @@ "test.source.end" : 18, "test.source.start" : 7 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "datadog.smoke.TestFailed", "service" : "test-maven-service", "start" : ${content_start_7}, @@ -277,7 +277,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "error.stack" : ${content_meta_error_stack}, "error.type" : "java.lang.AssertionError", @@ -312,7 +312,7 @@ "test.source.end" : 17, "test.source.start" : 14 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestFailed.test_another_failed", "service" : "test-maven-service", @@ -334,7 +334,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "error.stack" : ${content_meta_error_stack_2}, "error.type" : "java.lang.AssertionError", @@ -371,7 +371,7 @@ "test.source.end" : 17, "test.source.start" : 14 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestFailed.test_another_failed", "service" : "test-maven-service", @@ -393,7 +393,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "error.stack" : ${content_meta_error_stack_3}, "error.type" : "java.lang.AssertionError", @@ -430,7 +430,7 @@ "test.source.end" : 17, "test.source.start" : 14 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestFailed.test_another_failed", "service" : "test-maven-service", @@ -452,7 +452,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "error.stack" : ${content_meta_error_stack_4}, "error.type" : "java.lang.AssertionError", @@ -489,7 +489,7 @@ "test.source.end" : 17, "test.source.start" : 14 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestFailed.test_another_failed", "service" : "test-maven-service", @@ -511,7 +511,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "error.stack" : ${content_meta_error_stack_5}, "error.type" : "java.lang.AssertionError", @@ -549,7 +549,7 @@ "test.source.end" : 17, "test.source.start" : 14 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestFailed.test_another_failed", "service" : "test-maven-service", @@ -571,7 +571,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "error.stack" : ${content_meta_error_stack_6}, "error.type" : "java.lang.AssertionError", @@ -605,7 +605,7 @@ "test.source.end" : 12, "test.source.start" : 9 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestFailed.test_failed", "service" : "test-maven-service", @@ -627,7 +627,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -656,7 +656,7 @@ "test.source.end" : 13, "test.source.start" : 7 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "datadog.smoke.TestSucceeded", "service" : "test-maven-service", "start" : ${content_start_14}, @@ -675,7 +675,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -706,7 +706,7 @@ "test.source.end" : 12, "test.source.start" : 9 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestSucceeded.test_succeeded", "service" : "test-maven-service", 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 72b75564c5c..bcfa36fb89b 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 @@ -221,7 +221,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -250,7 +250,7 @@ "test.source.end" : 14, "test.source.start" : 7 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "datadog.smoke.TestSucceedPropertyAssertion", "service" : "test-maven-service", "start" : ${content_start_7}, @@ -269,7 +269,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -300,7 +300,7 @@ "test.source.end" : 12, "test.source.start" : 9 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestSucceedPropertyAssertion.test_succeed", "service" : "test-maven-service", 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 8f7034c33ba..1bda6c6aa80 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 @@ -322,7 +322,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "cucumber", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -348,7 +348,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id_2} }, - "name" : "junit.test_suite", + "name" : "cucumber.test_suite", "resource" : "classpath:datadog/smoke/basic_arithmetic.feature:Basic Arithmetic", "service" : "test-maven-service", "start" : ${content_start_10}, @@ -367,7 +367,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "cucumber", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -394,7 +394,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id_2} }, - "name" : "junit.test", + "name" : "cucumber.test", "parent_id" : ${content_parent_id_2}, "resource" : "classpath:datadog/smoke/basic_arithmetic.feature:Basic Arithmetic.Addition", "service" : "test-maven-service", 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 108563f0ddb..8507b84386a 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 @@ -265,7 +265,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -294,7 +294,7 @@ "test.source.end" : 18, "test.source.start" : 7 }, - "name" : "junit.test_suite", + "name" : "junit4.test_suite", "resource" : "datadog.smoke.TestSucceed", "service" : "test-maven-service", "start" : ${content_start_8}, @@ -313,7 +313,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -344,7 +344,7 @@ "test.source.end" : 12, "test.source.start" : 9 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestSucceed.test_succeed", "service" : "test-maven-service", @@ -366,7 +366,7 @@ "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit4", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -399,7 +399,7 @@ "test.source.end" : 17, "test.source.start" : 14 }, - "name" : "junit.test", + "name" : "junit4.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.TestSucceed.test_to_skip_with_itr", "service" : "test-maven-service", From 5a796b971de0f079e30c86470d88719bb8319817 Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Thu, 27 Feb 2025 14:26:17 +0100 Subject: [PATCH 12/41] update selenium test fixtures and fix fixture generation --- .../CiVisibilityInstrumentationTest.groovy | 6 +- .../test-succeed-multiple/events.ftl | 296 +++++++++--------- .../test-succeed-multiple/coverages.ftl | 1 - .../test-succeed-multiple/events.ftl | 207 ------------ .../test/resources/test-succeed/events.ftl | 16 +- .../selenium/AbstractSeleniumTest.groovy | 2 - 6 files changed, 160 insertions(+), 368 deletions(-) delete mode 100644 dd-java-agent/instrumentation/selenium/src/test/resources/test-succeed-multiple/coverages.ftl delete mode 100644 dd-java-agent/instrumentation/selenium/src/test/resources/test-succeed-multiple/events.ftl diff --git a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy index da5c0787886..266a4cd9147 100644 --- a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy @@ -365,8 +365,10 @@ abstract class CiVisibilityInstrumentationTest extends AgentTestRunner { // def clazz = this.getClass() // def resourceName = "/" + clazz.name.replace('.', '/') + ".class" // def classfilePath = clazz.getResource(resourceName).toURI().schemeSpecificPart - // def modulePath = classfilePath.substring(0, classfilePath.indexOf("/build/classes")) - // def baseTemplatesPath = modulePath + "/src/test/resources/" + testcaseName + // def searchIndex = classfilePath.indexOf("/build/classes/groovy") + // def modulePath = classfilePath.substring(0, searchIndex) + // def submoduleName = classfilePath.substring(searchIndex + "/build/classes/groovy".length()).split("/")[1] + // def baseTemplatesPath = modulePath + "/src/" + submoduleName + "/resources/" + testcaseName // CiVisibilityTestUtils.generateTemplates(baseTemplatesPath, events, coverages, additionalReplacements) // return [:] diff --git a/dd-java-agent/instrumentation/selenium/src/latestDepTest/resources/test-succeed-multiple/events.ftl b/dd-java-agent/instrumentation/selenium/src/latestDepTest/resources/test-succeed-multiple/events.ftl index 3b5d15a951a..d55391e8e9d 100644 --- a/dd-java-agent/instrumentation/selenium/src/latestDepTest/resources/test-succeed-multiple/events.ftl +++ b/dd-java-agent/instrumentation/selenium/src/latestDepTest/resources/test-succeed-multiple/events.ftl @@ -1,207 +1,207 @@ [ { - "type" : "test_suite_end", - "version" : 1, "content" : { - "test_session_id" : ${content_test_session_id}, - "test_module_id" : ${content_test_module_id}, - "test_suite_id" : ${content_test_suite_id}, - "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", - "name" : "junit.test_suite", - "resource" : "org.example.TestSucceedMultipleSelenium", - "start" : ${content_start}, "duration" : ${content_duration}, "error" : 0, - "metrics" : { - "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count}, - "test.source.end" : 19, - "test.source.start" : 11 - }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "test.type" : "test", - "test.source.file" : "dummy_source_path", - "test.module" : "selenium", - "test.status" : "pass", - "test_session.name" : "session-name", - "env" : "none", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", - "test.codeowners" : "[\"owner1\",\"owner2\"]", + "env" : "none", "library_version" : ${content_meta_library_version}, - "component" : "junit", "span.kind" : "test_suite_end", - "test.suite" : "org.example.TestSucceedMultipleSelenium", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "junit5" - } - } + "test.module" : "selenium", + "test.source.file" : "dummy_source_path", + "test.status" : "pass", + "test.suite" : "org.example.TestSucceedMultipleSelenium", + "test.type" : "test", + "test_session.name" : "session-name" + }, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count}, + "test.source.end" : 19, + "test.source.start" : 11 + }, + "name" : "junit5.test_suite", + "resource" : "org.example.TestSucceedMultipleSelenium", + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "start" : ${content_start}, + "test_module_id" : ${content_test_module_id}, + "test_session_id" : ${content_test_session_id}, + "test_suite_id" : ${content_test_suite_id} + }, + "type" : "test_suite_end", + "version" : 1 }, { - "type" : "test", - "version" : 2, "content" : { - "trace_id" : ${content_trace_id}, - "span_id" : ${content_span_id}, - "parent_id" : ${content_parent_id}, - "test_session_id" : ${content_test_session_id}, - "test_module_id" : ${content_test_module_id}, - "test_suite_id" : ${content_test_suite_id}, - "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", - "name" : "junit.test", - "resource" : "org.example.TestSucceedMultipleSelenium.test_succeed", - "start" : ${content_start_2}, "duration" : ${content_duration_2}, "error" : 0, - "metrics" : { - "process_id" : ${content_metrics_process_id}, - "_dd.profiling.enabled" : 0, - "_dd.trace_span_attribute_schema" : 0, - "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2}, - "test.source.end" : 18, - "test.source.start" : 12 - }, "meta" : { - "test.browser.driver_version" : ${content_meta_test_browser_driver_version}, + "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "test.source.file" : "dummy_source_path", - "test.source.method" : "test_succeed()V", - "test.module" : "selenium", - "test.status" : "pass", + "component" : "junit5", + "dummy_ci_tag" : "dummy_ci_tag_value", + "env" : "none", "language" : "jvm", - "test.browser.name" : "htmlunit", - "test.codeowners" : "[\"owner1\",\"owner2\"]", "library_version" : ${content_meta_library_version}, - "test.name" : "test_succeed", - "span.kind" : "test", - "test.suite" : "org.example.TestSucceedMultipleSelenium", "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "browser", + "span.kind" : "test", "test.browser.driver" : "selenium", - "test.is_rum_active" : "true", - "test_session.name" : "session-name", - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "junit", + "test.browser.driver_version" : ${content_meta_test_browser_driver_version}, + "test.browser.name" : "htmlunit", "test.browser.version" : ${content_meta_test_browser_version}, - "_dd.profiling.ctx" : "test", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "junit5" - } - } -}, { - "type" : "test", - "version" : 2, - "content" : { - "trace_id" : ${content_trace_id_2}, - "span_id" : ${content_span_id_2}, - "parent_id" : ${content_parent_id}, - "test_session_id" : ${content_test_session_id}, - "test_module_id" : ${content_test_module_id}, - "test_suite_id" : ${content_test_suite_id}, - "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", - "name" : "junit.test", - "resource" : "org.example.TestSucceedMultipleSelenium.test_succeed_another", - "start" : ${content_start_3}, - "duration" : ${content_duration_3}, - "error" : 0, + "test.is_rum_active" : "true", + "test.module" : "selenium", + "test.name" : "test_succeed", + "test.source.file" : "dummy_source_path", + "test.source.method" : "test_succeed()V", + "test.status" : "pass", + "test.suite" : "org.example.TestSucceedMultipleSelenium", + "test.type" : "browser", + "test_session.name" : "session-name" + }, "metrics" : { - "process_id" : ${content_metrics_process_id}, + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2}, "_dd.profiling.enabled" : 0, "_dd.trace_span_attribute_schema" : 0, - "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3}, + "process_id" : ${content_metrics_process_id}, "test.source.end" : 18, "test.source.start" : 12 }, + "name" : "junit5.test", + "parent_id" : ${content_parent_id}, + "resource" : "org.example.TestSucceedMultipleSelenium.test_succeed", + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "span_id" : ${content_span_id}, + "start" : ${content_start_2}, + "test_module_id" : ${content_test_module_id}, + "test_session_id" : ${content_test_session_id}, + "test_suite_id" : ${content_test_suite_id}, + "trace_id" : ${content_trace_id} + }, + "type" : "test", + "version" : 2 +}, { + "content" : { + "duration" : ${content_duration_3}, + "error" : 0, "meta" : { - "test.browser.driver_version" : ${content_meta_test_browser_driver_version}, + "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "test.source.file" : "dummy_source_path", - "test.source.method" : "test_succeed_another()V", - "test.module" : "selenium", - "test.status" : "pass", + "component" : "junit5", + "dummy_ci_tag" : "dummy_ci_tag_value", + "env" : "none", "language" : "jvm", - "test.browser.name" : "htmlunit", - "test.codeowners" : "[\"owner1\",\"owner2\"]", "library_version" : ${content_meta_library_version}, - "test.name" : "test_succeed_another", - "span.kind" : "test", - "test.suite" : "org.example.TestSucceedMultipleSelenium", "runtime-id" : ${content_meta_runtime_id}, - "test.type" : "browser", + "span.kind" : "test", "test.browser.driver" : "selenium", - "test.is_rum_active" : "true", - "test_session.name" : "session-name", - "env" : "none", - "dummy_ci_tag" : "dummy_ci_tag_value", - "component" : "junit", + "test.browser.driver_version" : ${content_meta_test_browser_driver_version}, + "test.browser.name" : "htmlunit", "test.browser.version" : ${content_meta_test_browser_version}, - "_dd.profiling.ctx" : "test", + "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "junit5" - } - } + "test.is_rum_active" : "true", + "test.module" : "selenium", + "test.name" : "test_succeed_another", + "test.source.file" : "dummy_source_path", + "test.source.method" : "test_succeed_another()V", + "test.status" : "pass", + "test.suite" : "org.example.TestSucceedMultipleSelenium", + "test.type" : "browser", + "test_session.name" : "session-name" + }, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0, + "process_id" : ${content_metrics_process_id}, + "test.source.end" : 18, + "test.source.start" : 12 + }, + "name" : "junit5.test", + "parent_id" : ${content_parent_id}, + "resource" : "org.example.TestSucceedMultipleSelenium.test_succeed_another", + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "span_id" : ${content_span_id_2}, + "start" : ${content_start_3}, + "test_module_id" : ${content_test_module_id}, + "test_session_id" : ${content_test_session_id}, + "test_suite_id" : ${content_test_suite_id}, + "trace_id" : ${content_trace_id_2} + }, + "type" : "test", + "version" : 2 }, { - "type" : "test_session_end", - "version" : 1, "content" : { - "test_session_id" : ${content_test_session_id}, - "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", - "name" : "junit.test_session", - "resource" : "selenium", - "start" : ${content_start_4}, "duration" : ${content_duration_4}, "error" : 0, - "metrics" : { - "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}, - "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}, - "test.type" : "test", + "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "test.status" : "pass", - "test_session.name" : "session-name", - "language" : "jvm", - "env" : "none", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", + "env" : "none", + "language" : "jvm", "library_version" : ${content_meta_library_version}, - "component" : "junit", - "_dd.profiling.ctx" : "test", - "span.kind" : "test_session_end", "runtime-id" : ${content_meta_runtime_id}, + "span.kind" : "test_session_end", "test.command" : "selenium", + "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "junit5" - } - } + "test.status" : "pass", + "test.type" : "test", + "test_session.name" : "session-name" + }, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}, + "_dd.profiling.enabled" : 0, + "_dd.trace_span_attribute_schema" : 0, + "process_id" : ${content_metrics_process_id} + }, + "name" : "junit5.test_session", + "resource" : "selenium", + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "start" : ${content_start_4}, + "test_session_id" : ${content_test_session_id} + }, + "type" : "test_session_end", + "version" : 1 }, { - "type" : "test_module_end", - "version" : 1, "content" : { - "test_session_id" : ${content_test_session_id}, - "test_module_id" : ${content_test_module_id}, - "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", - "name" : "junit.test_module", - "resource" : "selenium", - "start" : ${content_start_5}, "duration" : ${content_duration_5}, "error" : 0, - "metrics" : { - "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5} - }, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "test.type" : "test", - "test.module" : "selenium", - "test.status" : "pass", - "test_session.name" : "session-name", - "env" : "none", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", + "env" : "none", "library_version" : ${content_meta_library_version}, - "component" : "junit", "span.kind" : "test_module_end", + "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, - "test.framework" : "junit5" - } - } + "test.module" : "selenium", + "test.status" : "pass", + "test.type" : "test", + "test_session.name" : "session-name" + }, + "metrics" : { + "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5} + }, + "name" : "junit5.test_module", + "resource" : "selenium", + "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", + "start" : ${content_start_5}, + "test_module_id" : ${content_test_module_id}, + "test_session_id" : ${content_test_session_id} + }, + "type" : "test_module_end", + "version" : 1 } ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/selenium/src/test/resources/test-succeed-multiple/coverages.ftl b/dd-java-agent/instrumentation/selenium/src/test/resources/test-succeed-multiple/coverages.ftl deleted file mode 100644 index 8878e547a79..00000000000 --- a/dd-java-agent/instrumentation/selenium/src/test/resources/test-succeed-multiple/coverages.ftl +++ /dev/null @@ -1 +0,0 @@ -[ ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/selenium/src/test/resources/test-succeed-multiple/events.ftl b/dd-java-agent/instrumentation/selenium/src/test/resources/test-succeed-multiple/events.ftl deleted file mode 100644 index ccaee07fb18..00000000000 --- a/dd-java-agent/instrumentation/selenium/src/test/resources/test-succeed-multiple/events.ftl +++ /dev/null @@ -1,207 +0,0 @@ -[ { - "content" : { - "duration" : ${content_duration}, - "error" : 0, - "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", - "dummy_ci_tag" : "dummy_ci_tag_value", - "env" : "none", - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_suite_end", - "test.codeowners" : "[\"owner1\",\"owner2\"]", - "test.framework" : "junit5", - "test.framework_version" : ${content_meta_test_framework_version}, - "test.module" : "selenium", - "test.source.file" : "dummy_source_path", - "test.status" : "pass", - "test.suite" : "org.example.TestSucceedMultipleSelenium", - "test.type" : "test", - "test_session.name" : "session-name" - }, - "metrics" : { - "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count}, - "test.source.end" : 19, - "test.source.start" : 11 - }, - "name" : "junit.test_suite", - "resource" : "org.example.TestSucceedMultipleSelenium", - "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", - "start" : ${content_start}, - "test_module_id" : ${content_test_module_id}, - "test_session_id" : ${content_test_session_id}, - "test_suite_id" : ${content_test_suite_id} - }, - "type" : "test_suite_end", - "version" : 1 -}, { - "content" : { - "duration" : ${content_duration_2}, - "error" : 0, - "meta" : { - "_dd.profiling.ctx" : "test", - "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", - "dummy_ci_tag" : "dummy_ci_tag_value", - "env" : "none", - "language" : "jvm", - "library_version" : ${content_meta_library_version}, - "runtime-id" : ${content_meta_runtime_id}, - "span.kind" : "test", - "test.browser.driver" : "selenium", - "test.browser.driver_version" : ${content_meta_test_browser_driver_version}, - "test.browser.name" : "htmlunit", - "test.browser.version" : ${content_meta_test_browser_version}, - "test.codeowners" : "[\"owner1\",\"owner2\"]", - "test.framework" : "junit5", - "test.framework_version" : ${content_meta_test_framework_version}, - "test.is_rum_active" : "true", - "test.module" : "selenium", - "test.name" : "test_succeed", - "test.source.file" : "dummy_source_path", - "test.source.method" : "test_succeed()V", - "test.status" : "pass", - "test.suite" : "org.example.TestSucceedMultipleSelenium", - "test.type" : "browser", - "test_session.name" : "session-name" - }, - "metrics" : { - "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2}, - "_dd.profiling.enabled" : 0, - "_dd.trace_span_attribute_schema" : 0, - "process_id" : ${content_metrics_process_id}, - "test.source.end" : 18, - "test.source.start" : 12 - }, - "name" : "junit.test", - "parent_id" : ${content_parent_id}, - "resource" : "org.example.TestSucceedMultipleSelenium.test_succeed", - "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", - "span_id" : ${content_span_id}, - "start" : ${content_start_2}, - "test_module_id" : ${content_test_module_id}, - "test_session_id" : ${content_test_session_id}, - "test_suite_id" : ${content_test_suite_id}, - "trace_id" : ${content_trace_id} - }, - "type" : "test", - "version" : 2 -}, { - "content" : { - "duration" : ${content_duration_3}, - "error" : 0, - "meta" : { - "_dd.profiling.ctx" : "test", - "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", - "dummy_ci_tag" : "dummy_ci_tag_value", - "env" : "none", - "language" : "jvm", - "library_version" : ${content_meta_library_version}, - "runtime-id" : ${content_meta_runtime_id}, - "span.kind" : "test", - "test.browser.driver" : "selenium", - "test.browser.driver_version" : ${content_meta_test_browser_driver_version}, - "test.browser.name" : "htmlunit", - "test.browser.version" : ${content_meta_test_browser_version}, - "test.codeowners" : "[\"owner1\",\"owner2\"]", - "test.framework" : "junit5", - "test.framework_version" : ${content_meta_test_framework_version}, - "test.is_rum_active" : "true", - "test.module" : "selenium", - "test.name" : "test_succeed_another", - "test.source.file" : "dummy_source_path", - "test.source.method" : "test_succeed_another()V", - "test.status" : "pass", - "test.suite" : "org.example.TestSucceedMultipleSelenium", - "test.type" : "browser", - "test_session.name" : "session-name" - }, - "metrics" : { - "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3}, - "_dd.profiling.enabled" : 0, - "_dd.trace_span_attribute_schema" : 0, - "process_id" : ${content_metrics_process_id}, - "test.source.end" : 18, - "test.source.start" : 12 - }, - "name" : "junit.test", - "parent_id" : ${content_parent_id}, - "resource" : "org.example.TestSucceedMultipleSelenium.test_succeed_another", - "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", - "span_id" : ${content_span_id_2}, - "start" : ${content_start_3}, - "test_module_id" : ${content_test_module_id}, - "test_session_id" : ${content_test_session_id}, - "test_suite_id" : ${content_test_suite_id}, - "trace_id" : ${content_trace_id_2} - }, - "type" : "test", - "version" : 2 -}, { - "content" : { - "duration" : ${content_duration_4}, - "error" : 0, - "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_2}, - "_dd.profiling.ctx" : "test", - "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", - "dummy_ci_tag" : "dummy_ci_tag_value", - "env" : "none", - "language" : "jvm", - "library_version" : ${content_meta_library_version}, - "runtime-id" : ${content_meta_runtime_id}, - "span.kind" : "test_session_end", - "test.command" : "selenium", - "test.framework" : "junit5", - "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "pass", - "test.type" : "test", - "test_session.name" : "session-name" - }, - "metrics" : { - "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}, - "_dd.profiling.enabled" : 0, - "_dd.trace_span_attribute_schema" : 0, - "process_id" : ${content_metrics_process_id} - }, - "name" : "junit.test_session", - "resource" : "selenium", - "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", - "start" : ${content_start_4}, - "test_session_id" : ${content_test_session_id} - }, - "type" : "test_session_end", - "version" : 1 -}, { - "content" : { - "duration" : ${content_duration_5}, - "error" : 0, - "meta" : { - "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", - "dummy_ci_tag" : "dummy_ci_tag_value", - "env" : "none", - "library_version" : ${content_meta_library_version}, - "span.kind" : "test_module_end", - "test.framework" : "junit5", - "test.framework_version" : ${content_meta_test_framework_version}, - "test.module" : "selenium", - "test.status" : "pass", - "test.type" : "test", - "test_session.name" : "session-name" - }, - "metrics" : { - "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5} - }, - "name" : "junit.test_module", - "resource" : "selenium", - "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", - "start" : ${content_start_5}, - "test_module_id" : ${content_test_module_id}, - "test_session_id" : ${content_test_session_id} - }, - "type" : "test_module_end", - "version" : 1 -} ] \ No newline at end of file diff --git a/dd-java-agent/instrumentation/selenium/src/test/resources/test-succeed/events.ftl b/dd-java-agent/instrumentation/selenium/src/test/resources/test-succeed/events.ftl index 8705fbf791a..3758ace2563 100644 --- a/dd-java-agent/instrumentation/selenium/src/test/resources/test-succeed/events.ftl +++ b/dd-java-agent/instrumentation/selenium/src/test/resources/test-succeed/events.ftl @@ -4,7 +4,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -24,7 +24,7 @@ "test.source.end" : 19, "test.source.start" : 11 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "org.example.TestSucceedSelenium", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start}, @@ -41,7 +41,7 @@ "meta" : { "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -73,7 +73,7 @@ "test.source.end" : 18, "test.source.start" : 12 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "org.example.TestSucceedSelenium.test_succeed", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", @@ -94,7 +94,7 @@ "_dd.p.tid" : ${content_meta__dd_p_tid_2}, "_dd.profiling.ctx" : "test", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "language" : "jvm", @@ -114,7 +114,7 @@ "_dd.trace_span_attribute_schema" : 0, "process_id" : ${content_metrics_process_id} }, - "name" : "junit.test_session", + "name" : "junit5.test_session", "resource" : "selenium", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_3}, @@ -128,7 +128,7 @@ "error" : 0, "meta" : { "_dd.p.tid" : ${content_meta__dd_p_tid_3}, - "component" : "junit", + "component" : "junit5", "dummy_ci_tag" : "dummy_ci_tag_value", "env" : "none", "library_version" : ${content_meta_library_version}, @@ -143,7 +143,7 @@ "metrics" : { "_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4} }, - "name" : "junit.test_module", + "name" : "junit5.test_module", "resource" : "selenium", "service" : "worker.org.gradle.process.internal.worker.gradleworkermain", "start" : ${content_start_4}, diff --git a/dd-java-agent/instrumentation/selenium/src/testFixtures/groovy/datadog/trace/instrumentation/selenium/AbstractSeleniumTest.groovy b/dd-java-agent/instrumentation/selenium/src/testFixtures/groovy/datadog/trace/instrumentation/selenium/AbstractSeleniumTest.groovy index 66594d33362..baf0b7afdc1 100644 --- a/dd-java-agent/instrumentation/selenium/src/testFixtures/groovy/datadog/trace/instrumentation/selenium/AbstractSeleniumTest.groovy +++ b/dd-java-agent/instrumentation/selenium/src/testFixtures/groovy/datadog/trace/instrumentation/selenium/AbstractSeleniumTest.groovy @@ -52,8 +52,6 @@ abstract class AbstractSeleniumTest extends CiVisibilityInstrumentationTest { } protected void runTests(List> tests) { - TestEventsHandlerHolder.startForcefully(TestFrameworkInstrumentation.JUNIT5) - DiscoverySelector[] selectors = new DiscoverySelector[tests.size()] for (i in 0.. Date: Thu, 27 Feb 2025 15:12:54 +0100 Subject: [PATCH 13/41] fix codenarc issue --- .../trace/instrumentation/selenium/AbstractSeleniumTest.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/dd-java-agent/instrumentation/selenium/src/testFixtures/groovy/datadog/trace/instrumentation/selenium/AbstractSeleniumTest.groovy b/dd-java-agent/instrumentation/selenium/src/testFixtures/groovy/datadog/trace/instrumentation/selenium/AbstractSeleniumTest.groovy index baf0b7afdc1..02e2b5852fe 100644 --- a/dd-java-agent/instrumentation/selenium/src/testFixtures/groovy/datadog/trace/instrumentation/selenium/AbstractSeleniumTest.groovy +++ b/dd-java-agent/instrumentation/selenium/src/testFixtures/groovy/datadog/trace/instrumentation/selenium/AbstractSeleniumTest.groovy @@ -2,7 +2,6 @@ package datadog.trace.instrumentation.selenium import com.fasterxml.jackson.databind.ObjectMapper import datadog.trace.agent.test.server.http.TestHttpServer -import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation import datadog.trace.civisibility.CiVisibilityInstrumentationTest import datadog.communication.util.IOUtils From 568f709adf90453f07a3045270b007c5eb881b52 Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Fri, 28 Feb 2025 11:15:22 +0100 Subject: [PATCH 14/41] implements capabilities tagging logic # Conflicts: # dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy --- .../civisibility/CiVisibilitySystem.java | 24 +++++++++---- .../config/LibraryCapabilityUtils.java | 35 +++++++++++++++++++ .../domain/TestFrameworkSession.java | 8 ++++- .../trace/civisibility/domain/TestImpl.java | 9 +++++ .../civisibility/domain/TestSuiteImpl.java | 13 ++++++- .../domain/buildsystem/ProxyTestModule.java | 8 ++++- .../domain/buildsystem/ProxyTestSession.java | 14 ++++++-- .../domain/headless/HeadlessTestModule.java | 13 ++++++- .../domain/headless/HeadlessTestSession.java | 12 ++++++- .../domain/manualapi/ManualApiTestModule.java | 1 + .../events/NoOpTestEventsHandler.java | 4 ++- .../civisibility/test/ExecutionStrategy.java | 27 ++++++++++++++ .../trace/civisibility/utils/SpanUtils.java | 8 +++++ .../civisibility/domain/TestImplTest.groovy | 1 + .../domain/TestSuiteImplTest.groovy | 1 + .../buildsystem/ProxyTestModuleTest.groovy | 3 +- .../headless/HeadlessTestModuleTest.groovy | 1 + .../headless/HeadlessTestSessionTest.groovy | 34 +++++++++++++++--- .../CiVisibilityInstrumentationTest.groovy | 10 +++--- .../civisibility/CiVisibilityTestUtils.groovy | 31 ++++++++++++++++ .../agent/test/asserts/TagsAssert.groovy | 15 ++++++++ .../main/java/datadog/trace/api/DDTags.java | 17 +++++++++ .../civisibility/InstrumentationBridge.java | 8 +++-- .../config/LibraryCapability.java | 12 +++++++ .../events/TestEventsHandler.java | 4 ++- 25 files changed, 286 insertions(+), 27 deletions(-) create mode 100644 dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/LibraryCapabilityUtils.java create mode 100644 internal-api/src/main/java/datadog/trace/api/civisibility/config/LibraryCapability.java diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilitySystem.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilitySystem.java index ac467e6500a..4bcde858d17 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilitySystem.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilitySystem.java @@ -7,6 +7,7 @@ import datadog.trace.api.civisibility.DDTest; import datadog.trace.api.civisibility.DDTestSuite; import datadog.trace.api.civisibility.InstrumentationBridge; +import datadog.trace.api.civisibility.config.LibraryCapability; import datadog.trace.api.civisibility.coverage.CoveragePerTestBridge; import datadog.trace.api.civisibility.events.BuildEventsHandler; import datadog.trace.api.civisibility.events.TestEventsHandler; @@ -39,6 +40,7 @@ import java.lang.instrument.Instrumentation; import java.nio.file.Path; import java.nio.file.Paths; +import java.util.Collection; import java.util.function.Predicate; import javax.annotation.Nullable; import org.slf4j.Logger; @@ -167,9 +169,11 @@ private TestEventsHandlerFactory( public TestEventsHandler create( String component, @Nullable ContextStore suiteStore, - @Nullable ContextStore testStore) { + @Nullable ContextStore testStore, + Collection availableCapabilities) { TestFrameworkSession testSession = - sessionFactory.startSession(repoServices.moduleName, component, null); + sessionFactory.startSession( + repoServices.moduleName, component, null, availableCapabilities); TestFrameworkModule testModule = testSession.testModuleStart(repoServices.moduleName, null); return new TestEventsHandlerImpl<>( services.metricCollector, @@ -231,7 +235,10 @@ private static TestFrameworkSession.Factory childTestFrameworkSessionFactory( CiVisibilityRepoServices repoServices, CiVisibilityCoverageServices.Child coverageServices, ExecutionSettings executionSettings) { - return (String projectName, String component, Long startTime) -> { + return (String projectName, + String component, + Long startTime, + Collection availableCapabilities) -> { String sessionName = services.config.getCiVisibilitySessionName(); String testCommand = services.config.getCiVisibilityTestCommand(); TestDecorator testDecorator = @@ -255,7 +262,8 @@ private static TestFrameworkSession.Factory childTestFrameworkSessionFactory( coverageServices.coverageStoreFactory, coverageServices.coverageReporter, services.signalClientFactory, - executionStrategy); + executionStrategy, + availableCapabilities); }; } @@ -264,7 +272,10 @@ private static TestFrameworkSession.Factory headlessTestFrameworkSessionFactory( CiVisibilityRepoServices repoServices, CiVisibilityCoverageServices.Child coverageServices, ExecutionSettings executionSettings) { - return (String projectName, String component, Long startTime) -> { + return (String projectName, + String component, + Long startTime, + Collection availableCapabilities) -> { repoServices.gitDataUploader.startOrObserveGitDataUpload(); String sessionName = services.config.getCiVisibilitySessionName(); @@ -288,7 +299,8 @@ private static TestFrameworkSession.Factory headlessTestFrameworkSessionFactory( repoServices.codeowners, services.linesResolver, coverageServices.coverageStoreFactory, - executionStrategy); + executionStrategy, + availableCapabilities); }; } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/LibraryCapabilityUtils.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/LibraryCapabilityUtils.java new file mode 100644 index 00000000000..bef9cf723ca --- /dev/null +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/LibraryCapabilityUtils.java @@ -0,0 +1,35 @@ +package datadog.trace.civisibility.config; + +import datadog.trace.api.DDTags; +import datadog.trace.api.civisibility.config.LibraryCapability; +import java.util.Collection; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.Map; + +public abstract class LibraryCapabilityUtils { + + public static final Map CAPABILITY_TAG_MAP = capabilitiesTagMap(); + + private static Map capabilitiesTagMap() { + Map capabilitiesTags = new EnumMap<>(LibraryCapability.class); + capabilitiesTags.put(LibraryCapability.TIA, DDTags.LIBRARY_CAPABILITIES_TIA); + capabilitiesTags.put(LibraryCapability.EFD, DDTags.LIBRARY_CAPABILITIES_EFD); + capabilitiesTags.put(LibraryCapability.ATR, DDTags.LIBRARY_CAPABILITIES_ATR); + capabilitiesTags.put(LibraryCapability.IMPACTED, DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS); + capabilitiesTags.put( + LibraryCapability.FAIL_FAST, DDTags.LIBRARY_CAPABILITIES_FAIL_FAST_TEST_ORDER); + capabilitiesTags.put(LibraryCapability.QUARANTINE, DDTags.LIBRARY_CAPABILITIES_QUARANTINE); + capabilitiesTags.put(LibraryCapability.DISABLED, DDTags.LIBRARY_CAPABILITIES_DISABLED); + capabilitiesTags.put( + LibraryCapability.ATTEMPT_TO_FIX, DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX); + return capabilitiesTags; + } + + public static Map filterCapabilities( + Collection available, Map capabilitiesStatus) { + Map capabilities = new HashMap<>(capabilitiesStatus); + capabilities.keySet().retainAll(available); + return capabilities; + } +} diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestFrameworkSession.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestFrameworkSession.java index 0e7ec2d1737..b1f398fc4a0 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestFrameworkSession.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestFrameworkSession.java @@ -1,5 +1,7 @@ package datadog.trace.civisibility.domain; +import datadog.trace.api.civisibility.config.LibraryCapability; +import java.util.Collection; import javax.annotation.Nullable; /** Test session abstraction that is used by test framework instrumentations (e.g. JUnit, TestNG) */ @@ -9,6 +11,10 @@ public interface TestFrameworkSession { TestFrameworkModule testModuleStart(String moduleName, @Nullable Long startTime); interface Factory { - TestFrameworkSession startSession(String projectName, String component, Long startTime); + TestFrameworkSession startSession( + String projectName, + String component, + Long startTime, + Collection availableCapabilities); } } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java index 679b3c46894..8a4fd7af037 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java @@ -9,6 +9,7 @@ import datadog.trace.api.civisibility.CIConstants; import datadog.trace.api.civisibility.DDTest; import datadog.trace.api.civisibility.InstrumentationTestBridge; +import datadog.trace.api.civisibility.config.LibraryCapability; import datadog.trace.api.civisibility.config.TestIdentifier; import datadog.trace.api.civisibility.coverage.CoveragePerTestBridge; import datadog.trace.api.civisibility.coverage.CoverageStore; @@ -37,6 +38,7 @@ import datadog.trace.bootstrap.instrumentation.api.TagContext; import datadog.trace.bootstrap.instrumentation.api.Tags; import datadog.trace.civisibility.codeowners.Codeowners; +import datadog.trace.civisibility.config.LibraryCapabilityUtils; import datadog.trace.civisibility.decorator.TestDecorator; import datadog.trace.civisibility.source.LinesResolver; import datadog.trace.civisibility.source.SourcePathResolver; @@ -45,6 +47,7 @@ import java.lang.reflect.Method; import java.util.Collection; import java.util.Collections; +import java.util.Map; import java.util.function.Consumer; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -86,6 +89,7 @@ public TestImpl( Codeowners codeowners, CoverageStore.Factory coverageStoreFactory, ExecutionResults executionResults, + Map libraryCapabilities, Consumer onSpanFinish) { this.instrumentation = instrumentation; this.metricCollector = metricCollector; @@ -144,6 +148,11 @@ public TestImpl( span.setTag(Tags.ITR_CORRELATION_ID, itrCorrelationId); } + for (Map.Entry entry : libraryCapabilities.entrySet()) { + String capabilityTag = LibraryCapabilityUtils.CAPABILITY_TAG_MAP.get(entry.getKey()); + span.setTag(capabilityTag, entry.getValue()); + } + testDecorator.afterStart(span); metricCollector.add(CiVisibilityCountMetric.EVENT_CREATED, 1, instrumentation, EventType.TEST); diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java index 024f77f0b4d..82168155002 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java @@ -6,6 +6,7 @@ import datadog.trace.api.Config; import datadog.trace.api.civisibility.DDTestSuite; +import datadog.trace.api.civisibility.config.LibraryCapability; import datadog.trace.api.civisibility.coverage.CoverageStore; import datadog.trace.api.civisibility.telemetry.CiVisibilityCountMetric; import datadog.trace.api.civisibility.telemetry.CiVisibilityMetricCollector; @@ -26,6 +27,7 @@ import datadog.trace.civisibility.utils.SpanUtils; import java.lang.reflect.Method; import java.util.Collection; +import java.util.Map; import java.util.function.Consumer; import javax.annotation.Nullable; import org.slf4j.Logger; @@ -52,6 +54,7 @@ public class TestSuiteImpl implements DDTestSuite { private final CoverageStore.Factory coverageStoreFactory; private final ExecutionResults executionResults; private final boolean parallelized; + private final Map libraryCapabilities; private final Consumer onSpanFinish; public TestSuiteImpl( @@ -72,6 +75,7 @@ public TestSuiteImpl( LinesResolver linesResolver, CoverageStore.Factory coverageStoreFactory, ExecutionResults executionResults, + Map libraryCapabilities, Consumer onSpanFinish) { this.moduleSpanContext = moduleSpanContext; this.moduleName = moduleName; @@ -88,6 +92,7 @@ public TestSuiteImpl( this.linesResolver = linesResolver; this.coverageStoreFactory = coverageStoreFactory; this.executionResults = executionResults; + this.libraryCapabilities = libraryCapabilities; this.onSpanFinish = onSpanFinish; AgentTracer.SpanBuilder spanBuilder = @@ -259,6 +264,12 @@ public TestImpl testStart( codeowners, coverageStoreFactory, executionResults, - SpanUtils.propagateCiVisibilityTagsTo(span)); + libraryCapabilities, + this::propagateTestTags); + } + + private void propagateTestTags(AgentSpan testSpan) { + SpanUtils.propagateCiVisibilityTags(span, testSpan); + SpanUtils.propagateLibraryCapabilities(span, testSpan); } } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestModule.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestModule.java index 8784278770b..a10a82e260b 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestModule.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestModule.java @@ -2,6 +2,7 @@ import datadog.trace.api.Config; import datadog.trace.api.DDTraceId; +import datadog.trace.api.civisibility.config.LibraryCapability; import datadog.trace.api.civisibility.config.TestIdentifier; import datadog.trace.api.civisibility.config.TestSourceData; import datadog.trace.api.civisibility.coverage.CoverageStore; @@ -30,6 +31,7 @@ import datadog.trace.civisibility.test.ExecutionResults; import datadog.trace.civisibility.test.ExecutionStrategy; import java.util.Collection; +import java.util.Map; import java.util.TreeSet; import java.util.concurrent.ConcurrentHashMap; import javax.annotation.Nonnull; @@ -60,6 +62,7 @@ public class ProxyTestModule implements TestFrameworkModule { private final LinesResolver linesResolver; private final CoverageStore.Factory coverageStoreFactory; private final Collection testFrameworks = ConcurrentHashMap.newKeySet(); + private final Map libraryCapabilities; public ProxyTestModule( AgentSpanContext parentProcessModuleContext, @@ -73,7 +76,8 @@ public ProxyTestModule( LinesResolver linesResolver, CoverageStore.Factory coverageStoreFactory, ChildProcessCoverageReporter childProcessCoverageReporter, - SignalClient.Factory signalClientFactory) { + SignalClient.Factory signalClientFactory, + Map libraryCapabilities) { this.parentProcessModuleContext = parentProcessModuleContext; this.moduleName = moduleName; this.executionStrategy = executionStrategy; @@ -87,6 +91,7 @@ public ProxyTestModule( this.codeowners = codeowners; this.linesResolver = linesResolver; this.coverageStoreFactory = coverageStoreFactory; + this.libraryCapabilities = libraryCapabilities; } @Override @@ -205,6 +210,7 @@ public TestSuiteImpl testSuiteStart( linesResolver, coverageStoreFactory, executionResults, + libraryCapabilities, this::propagateTestFrameworkData); } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestSession.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestSession.java index 25a7f86b119..651d13597b1 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestSession.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestSession.java @@ -1,11 +1,13 @@ package datadog.trace.civisibility.domain.buildsystem; import datadog.trace.api.Config; +import datadog.trace.api.civisibility.config.LibraryCapability; import datadog.trace.api.civisibility.coverage.CoverageStore; import datadog.trace.api.civisibility.telemetry.CiVisibilityMetricCollector; import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.civisibility.codeowners.Codeowners; +import datadog.trace.civisibility.config.LibraryCapabilityUtils; import datadog.trace.civisibility.coverage.percentage.child.ChildProcessCoverageReporter; import datadog.trace.civisibility.decorator.TestDecorator; import datadog.trace.civisibility.domain.TestFrameworkModule; @@ -14,6 +16,8 @@ import datadog.trace.civisibility.source.LinesResolver; import datadog.trace.civisibility.source.SourcePathResolver; import datadog.trace.civisibility.test.ExecutionStrategy; +import java.util.Collection; +import java.util.Map; import javax.annotation.Nullable; /** @@ -34,6 +38,7 @@ public class ProxyTestSession implements TestFrameworkSession { private final ChildProcessCoverageReporter childProcessCoverageReporter; private final SignalClient.Factory signalClientFactory; private final ExecutionStrategy executionStrategy; + private final Map libraryCapabilities; public ProxyTestSession( AgentSpanContext parentProcessModuleContext, @@ -46,7 +51,8 @@ public ProxyTestSession( CoverageStore.Factory coverageStoreFactory, ChildProcessCoverageReporter childProcessCoverageReporter, SignalClient.Factory signalClientFactory, - ExecutionStrategy executionStrategy) { + ExecutionStrategy executionStrategy, + Collection availableCapabilities) { this.parentProcessModuleContext = parentProcessModuleContext; this.config = config; this.metricCollector = metricCollector; @@ -58,6 +64,9 @@ public ProxyTestSession( this.childProcessCoverageReporter = childProcessCoverageReporter; this.signalClientFactory = signalClientFactory; this.executionStrategy = executionStrategy; + this.libraryCapabilities = + LibraryCapabilityUtils.filterCapabilities( + availableCapabilities, executionStrategy.getCapabilitiesStatus()); } @Override @@ -82,6 +91,7 @@ public TestFrameworkModule testModuleStart(String moduleName, @Nullable Long sta linesResolver, coverageStoreFactory, childProcessCoverageReporter, - signalClientFactory); + signalClientFactory, + libraryCapabilities); } } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java index 997b8fbc020..031d4378f2d 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java @@ -3,6 +3,7 @@ import datadog.trace.api.Config; import datadog.trace.api.DDTags; import datadog.trace.api.civisibility.CIConstants; +import datadog.trace.api.civisibility.config.LibraryCapability; import datadog.trace.api.civisibility.config.TestIdentifier; import datadog.trace.api.civisibility.config.TestSourceData; import datadog.trace.api.civisibility.coverage.CoverageStore; @@ -27,6 +28,7 @@ import datadog.trace.civisibility.test.ExecutionResults; import datadog.trace.civisibility.test.ExecutionStrategy; import datadog.trace.civisibility.utils.SpanUtils; +import java.util.Map; import java.util.function.Consumer; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -43,6 +45,7 @@ public class HeadlessTestModule extends AbstractTestModule implements TestFramew private final CoverageStore.Factory coverageStoreFactory; private final ExecutionStrategy executionStrategy; private final ExecutionResults executionResults; + private final Map libraryCapabilities; public HeadlessTestModule( AgentSpanContext sessionSpanContext, @@ -56,6 +59,7 @@ public HeadlessTestModule( LinesResolver linesResolver, CoverageStore.Factory coverageStoreFactory, ExecutionStrategy executionStrategy, + Map libraryCapabilities, Consumer onSpanFinish) { super( sessionSpanContext, @@ -72,6 +76,7 @@ public HeadlessTestModule( this.coverageStoreFactory = coverageStoreFactory; this.executionStrategy = executionStrategy; this.executionResults = new ExecutionResults(); + this.libraryCapabilities = libraryCapabilities; } @Override @@ -176,6 +181,12 @@ public TestSuiteImpl testSuiteStart( linesResolver, coverageStoreFactory, executionResults, - SpanUtils.propagateCiVisibilityTagsTo(span)); + libraryCapabilities, + this::propagateSuiteTags); + } + + private void propagateSuiteTags(AgentSpan suiteSpan) { + SpanUtils.propagateCiVisibilityTags(span, suiteSpan); + SpanUtils.propagateLibraryCapabilities(span, suiteSpan); } } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java index 1bed53b8344..5b38a494ef7 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java @@ -3,6 +3,7 @@ import datadog.trace.api.Config; import datadog.trace.api.DDTags; import datadog.trace.api.civisibility.CIConstants; +import datadog.trace.api.civisibility.config.LibraryCapability; import datadog.trace.api.civisibility.coverage.CoverageStore; import datadog.trace.api.civisibility.telemetry.CiVisibilityMetricCollector; import datadog.trace.api.civisibility.telemetry.TagValue; @@ -11,6 +12,7 @@ import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.Tags; import datadog.trace.civisibility.codeowners.Codeowners; +import datadog.trace.civisibility.config.LibraryCapabilityUtils; import datadog.trace.civisibility.decorator.TestDecorator; import datadog.trace.civisibility.domain.AbstractTestSession; import datadog.trace.civisibility.domain.InstrumentationType; @@ -21,6 +23,7 @@ import datadog.trace.civisibility.utils.SpanUtils; import java.util.Collection; import java.util.Collections; +import java.util.Map; import javax.annotation.Nullable; /** @@ -34,6 +37,7 @@ public class HeadlessTestSession extends AbstractTestSession implements TestFram private final ExecutionStrategy executionStrategy; private final CoverageStore.Factory coverageStoreFactory; + private final Map libraryCapabilities; public HeadlessTestSession( String projectName, @@ -46,7 +50,8 @@ public HeadlessTestSession( Codeowners codeowners, LinesResolver linesResolver, CoverageStore.Factory coverageStoreFactory, - ExecutionStrategy executionStrategy) { + ExecutionStrategy executionStrategy, + Collection availableCapabilities) { super( projectName, startTime, @@ -60,6 +65,9 @@ public HeadlessTestSession( linesResolver); this.executionStrategy = executionStrategy; this.coverageStoreFactory = coverageStoreFactory; + this.libraryCapabilities = + LibraryCapabilityUtils.filterCapabilities( + availableCapabilities, executionStrategy.getCapabilitiesStatus()); } @Override @@ -76,11 +84,13 @@ public HeadlessTestModule testModuleStart(String moduleName, @Nullable Long star linesResolver, coverageStoreFactory, executionStrategy, + libraryCapabilities, this::propagateModuleTags); } private void propagateModuleTags(AgentSpan moduleSpan) { SpanUtils.propagateCiVisibilityTags(span, moduleSpan); + SpanUtils.propagateLibraryCapabilities(span, moduleSpan); SpanUtils.propagateTags( span, moduleSpan, diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java index 4d9d3f54e68..382d1d9d4ff 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java @@ -79,6 +79,7 @@ public TestSuiteImpl testSuiteStart( linesResolver, coverageStoreFactory, executionResults, + null, SpanUtils.propagateCiVisibilityTagsTo(span)); } } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/NoOpTestEventsHandler.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/NoOpTestEventsHandler.java index 2a0f408a56e..87e5855a75b 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/NoOpTestEventsHandler.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/NoOpTestEventsHandler.java @@ -2,6 +2,7 @@ import datadog.trace.api.civisibility.DDTest; import datadog.trace.api.civisibility.DDTestSuite; +import datadog.trace.api.civisibility.config.LibraryCapability; import datadog.trace.api.civisibility.config.TestIdentifier; import datadog.trace.api.civisibility.config.TestSourceData; import datadog.trace.api.civisibility.events.TestEventsHandler; @@ -124,7 +125,8 @@ public static final class Factory implements TestEventsHandler.Factory { public TestEventsHandler create( String component, @Nullable ContextStore suiteStore, - @Nullable ContextStore testStore) { + @Nullable ContextStore testStore, + Collection availableCapabilities) { return new NoOpTestEventsHandler<>(); } } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionStrategy.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionStrategy.java index 7f2f794120e..880c60f3f53 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionStrategy.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionStrategy.java @@ -1,6 +1,8 @@ package datadog.trace.civisibility.test; import datadog.trace.api.Config; +import datadog.trace.api.civisibility.CIConstants; +import datadog.trace.api.civisibility.config.LibraryCapability; import datadog.trace.api.civisibility.config.TestIdentifier; import datadog.trace.api.civisibility.config.TestMetadata; import datadog.trace.api.civisibility.config.TestSourceData; @@ -18,6 +20,7 @@ import datadog.trace.civisibility.source.LinesResolver; import datadog.trace.civisibility.source.SourcePathResolver; import java.lang.reflect.Method; +import java.util.EnumMap; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; import javax.annotation.Nonnull; @@ -219,4 +222,28 @@ private LinesResolver.Lines getLines(Method testMethod) { return linesResolver.getMethodLines(testMethod); } } + + public Map getCapabilitiesStatus() { + Map capabilities = new EnumMap<>(LibraryCapability.class); + + capabilities.put(LibraryCapability.TIA, executionSettings.isTestSkippingEnabled()); + + EarlyFlakeDetectionSettings efdSettings = executionSettings.getEarlyFlakeDetectionSettings(); + capabilities.put(LibraryCapability.EFD, efdSettings.isEnabled()); + + capabilities.put(LibraryCapability.ATR, executionSettings.isFlakyTestRetriesEnabled()); + capabilities.put( + LibraryCapability.IMPACTED, executionSettings.isImpactedTestsDetectionEnabled()); + + String testOrder = Config.get().getCiVisibilityTestOrder(); + capabilities.put( + LibraryCapability.FAIL_FAST, CIConstants.FAIL_FAST_TEST_ORDER.equalsIgnoreCase(testOrder)); + + TestManagementSettings testManagementSettings = executionSettings.getTestManagementSettings(); + capabilities.put(LibraryCapability.QUARANTINE, testManagementSettings.isEnabled()); + capabilities.put(LibraryCapability.DISABLED, testManagementSettings.isEnabled()); + capabilities.put(LibraryCapability.ATTEMPT_TO_FIX, testManagementSettings.isEnabled()); + + return capabilities; + } } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/SpanUtils.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/SpanUtils.java index 7e47ec79bfe..396a83b40c6 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/SpanUtils.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/SpanUtils.java @@ -2,6 +2,7 @@ import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.Tags; +import datadog.trace.civisibility.config.LibraryCapabilityUtils; import datadog.trace.civisibility.domain.TestStatus; import datadog.trace.civisibility.ipc.TestFramework; import java.util.ArrayList; @@ -32,6 +33,13 @@ public static void mergeTestFrameworks(AgentSpan span, Collection setFrameworks(span, merged); } + public static void propagateLibraryCapabilities(AgentSpan parentSpan, AgentSpan childSpan) { + propagateTags( + parentSpan, + childSpan, + LibraryCapabilityUtils.CAPABILITY_TAG_MAP.values().toArray(new String[0])); + } + private static Collection getFrameworks(AgentSpan span) { Object nameTag = span.getTag(Tags.TEST_FRAMEWORK); Object versionTag = span.getTag(Tags.TEST_FRAMEWORK_VERSION); diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy index eed93706371..e6adb4a3b6c 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy @@ -126,6 +126,7 @@ class TestImplTest extends SpanWriterTest { codeowners, coverageStoreFactory, executionResults, + [:], SpanUtils.DO_NOT_PROPAGATE_CI_VISIBILITY_TAGS ) } diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestSuiteImplTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestSuiteImplTest.groovy index 2acfcc0dc79..f51f8df278f 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestSuiteImplTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestSuiteImplTest.groovy @@ -85,6 +85,7 @@ class TestSuiteImplTest extends SpanWriterTest { linesResolver, coverageStoreFactory, executionResults, + [:], SpanUtils.DO_NOT_PROPAGATE_CI_VISIBILITY_TAGS ) } diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/buildsystem/ProxyTestModuleTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/buildsystem/ProxyTestModuleTest.groovy index c4cc84ccfa6..6553b8cb2b9 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/buildsystem/ProxyTestModuleTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/buildsystem/ProxyTestModuleTest.groovy @@ -51,7 +51,8 @@ class ProxyTestModuleTest extends DDSpecification { Stub(LinesResolver), Stub(CoverageStore.Factory), Stub(ChildProcessCoverageReporter), - GroovyMock(SignalClient.Factory) + GroovyMock(SignalClient.Factory), + [:] ) when: diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/headless/HeadlessTestModuleTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/headless/HeadlessTestModuleTest.groovy index b941591ba8c..2fcca913cea 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/headless/HeadlessTestModuleTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/headless/HeadlessTestModuleTest.groovy @@ -66,6 +66,7 @@ class HeadlessTestModuleTest extends SpanWriterTest { Stub(LinesResolver), Stub(CoverageStore.Factory), executionStrategy, + [:], (span) -> { } ) } diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/headless/HeadlessTestSessionTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/headless/HeadlessTestSessionTest.groovy index 1cf2e858e31..84c1e0ea5b3 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/headless/HeadlessTestSessionTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/headless/HeadlessTestSessionTest.groovy @@ -3,9 +3,12 @@ package datadog.trace.civisibility.domain.headless import datadog.trace.agent.test.asserts.ListWriterAssert import datadog.trace.api.Config import datadog.trace.api.DDSpanTypes +import datadog.trace.api.DDTags +import datadog.trace.api.civisibility.config.LibraryCapability import datadog.trace.api.civisibility.coverage.CoverageStore import datadog.trace.api.civisibility.telemetry.CiVisibilityMetricCollector import datadog.trace.api.civisibility.telemetry.tag.Provider +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation import datadog.trace.bootstrap.instrumentation.api.Tags import datadog.trace.civisibility.codeowners.Codeowners import datadog.trace.civisibility.config.ExecutionSettings @@ -18,37 +21,57 @@ import datadog.trace.civisibility.test.ExecutionStrategy class HeadlessTestSessionTest extends SpanWriterTest { - def "test tags are populated correctly in span"() { + def "test tags are propagated correctly"() { setup: def session = givenAHeadlessTestSession() def module = session.testModuleStart("module-name", null) + def suite = module.testSuiteStart("suite-name", MyClass, null, false, TestFrameworkInstrumentation.OTHER) + def test = suite.testStart("test-name", null, null, null) when: + test.end(null) + suite.end(null) module.end(null) session.end(null) then: - ListWriterAssert.assertTraces(TEST_WRITER, 1, false, { - trace(2) { + ListWriterAssert.assertTraces(TEST_WRITER, 2, false, { + trace(3) { span(0) { spanType DDSpanTypes.TEST_SESSION_END tags(false) { "$Tags.TEST_TEST_MANAGEMENT_ENABLED" true + "$DDTags.LIBRARY_CAPABILITIES_TIA" false + "$DDTags.LIBRARY_CAPABILITIES_EFD" false + "$DDTags.LIBRARY_CAPABILITIES_QUARANTINE" true + isNotPresent("$DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX") } } - span (1) { + span(1) { spanType DDSpanTypes.TEST_MODULE_END } + span(2) { + spanType DDSpanTypes.TEST_SUITE_END + } + } + trace(1) { + span(0) { + spanType DDSpanTypes.TEST + } } }) } + private static final class MyClass {} + private HeadlessTestSession givenAHeadlessTestSession() { def executionSettings = Stub(ExecutionSettings) executionSettings.getTestManagementSettings() >> new TestManagementSettings(true, 10) def executionStrategy = new ExecutionStrategy(Stub(Config), executionSettings, Stub(SourcePathResolver), Stub(LinesResolver)) + def availableCapabilities = [LibraryCapability.TIA, LibraryCapability.EFD, LibraryCapability.QUARANTINE] + new HeadlessTestSession( "project-name", null, @@ -60,7 +83,8 @@ class HeadlessTestSessionTest extends SpanWriterTest { Stub(Codeowners), Stub(LinesResolver), Stub(CoverageStore.Factory), - executionStrategy + executionStrategy, + availableCapabilities ) } } diff --git a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy index 4d43300118e..411062fadfd 100644 --- a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy @@ -9,6 +9,7 @@ import datadog.trace.api.civisibility.CIConstants import datadog.trace.api.civisibility.DDTest import datadog.trace.api.civisibility.DDTestSuite import datadog.trace.api.civisibility.InstrumentationBridge +import datadog.trace.api.civisibility.config.LibraryCapability import datadog.trace.api.civisibility.config.TestFQN import datadog.trace.api.civisibility.config.TestIdentifier import datadog.trace.api.civisibility.config.TestMetadata @@ -136,7 +137,7 @@ abstract class CiVisibilityInstrumentationTest extends AgentTestRunner { def executionSettingsFactory = new MockExecutionSettingsFactory(settings) def coverageStoreFactory = new FileCoverageStore.Factory(metricCollector, sourcePathResolver) - TestFrameworkSession.Factory testFrameworkSessionFactory = (String projectName, String component, Long startTime) -> { + TestFrameworkSession.Factory testFrameworkSessionFactory = (String projectName, String component, Long startTime, Collection availableCapabilities) -> { def config = Config.get() def ciTags = [(DUMMY_CI_TAG): DUMMY_CI_TAG_VALUE] TestDecorator testDecorator = new TestDecoratorImpl(component, "session-name", "test-command", ciTags) @@ -155,7 +156,8 @@ abstract class CiVisibilityInstrumentationTest extends AgentTestRunner { config, executionSettingsFactory.create(JvmInfo.CURRENT_JVM, ""), sourcePathResolver, - linesResolver) + linesResolver), + availableCapabilities ) } @@ -254,8 +256,8 @@ abstract class CiVisibilityInstrumentationTest extends AgentTestRunner { } @Override - TestEventsHandler create(String component, ContextStore suiteStore, ContextStore testStore) { - TestFrameworkSession testSession = testFrameworkSessionFactory.startSession(moduleName, component, null) + TestEventsHandler create(String component, ContextStore suiteStore, ContextStore testStore, Collection availableCapabilities) { + TestFrameworkSession testSession = testFrameworkSessionFactory.startSession(moduleName, component, null, availableCapabilities) TestFrameworkModule testModule = testSession.testModuleStart(moduleName, null) new TestEventsHandlerImpl(metricCollector, testSession, testModule, suiteStore != null ? suiteStore : new ConcurrentHashMapContextStore<>(), diff --git a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityTestUtils.groovy b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityTestUtils.groovy index 5e4c61cbffd..9c7ddac0ebf 100644 --- a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityTestUtils.groovy +++ b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityTestUtils.groovy @@ -7,17 +7,23 @@ import com.jayway.jsonpath.JsonPath import com.jayway.jsonpath.Option import com.jayway.jsonpath.ReadContext import com.jayway.jsonpath.WriteContext +import datadog.trace.agent.test.asserts.ListWriterAssert import datadog.trace.api.Config +import datadog.trace.api.DDSpanTypes import datadog.trace.civisibility.ci.CIProviderInfoFactory import datadog.trace.civisibility.ci.GitLabInfo import datadog.trace.civisibility.ci.GithubActionsInfo import datadog.trace.civisibility.ci.env.CiEnvironment import datadog.trace.civisibility.ci.env.CiEnvironmentImpl +import datadog.trace.common.writer.ListWriter +import datadog.trace.core.DDSpan import freemarker.core.Environment import freemarker.core.InvalidReferenceException import freemarker.template.Template import freemarker.template.TemplateException import freemarker.template.TemplateExceptionHandler +import groovy.transform.stc.ClosureParams +import groovy.transform.stc.SimpleType import org.skyscreamer.jsonassert.JSONAssert import org.skyscreamer.jsonassert.JSONCompareMode @@ -129,6 +135,31 @@ abstract class CiVisibilityTestUtils { return replacementMap } + // Will sort traces in the following order: SESSION -> MODULE -> SUITE -> TEST + static class SortTracesByType implements Comparator> { + @Override + int compare(List o1, List o2) { + return Integer.compare(rootSpanTypeToVal(o1), rootSpanTypeToVal(o2)) + } + + int rootSpanTypeToVal(List trace) { + assert !trace.isEmpty() + def spanType = trace.get(0).getSpanType() + switch (spanType) { + case DDSpanTypes.TEST_SESSION_END: + return 0 + case DDSpanTypes.TEST_MODULE_END: + return 1 + case DDSpanTypes.TEST_SUITE_END: + return 2 + case DDSpanTypes.TEST: + return 3 + default: + return 4 + } + } + } + static final Configuration JSON_PATH_CONFIG = Configuration.builder() .options(Option.SUPPRESS_EXCEPTIONS) .build() diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TagsAssert.groovy b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TagsAssert.groovy index 98bbf2da0f5..6a32ddcc580 100644 --- a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TagsAssert.groovy +++ b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TagsAssert.groovy @@ -56,6 +56,21 @@ class TagsAssert { tag(name, { it != null }) } + def arePresent(Collection tags) { + for (String name : tags) { + tag(name, { it != null }) + } + } + + def isNotPresent(String name) { + tag(name, { it == null }) + } + + def areNotPresent(Collection tags) { + for (String name : tags) { + tag(name, { it == null }) + } + } /** * @param distributedRootSpan set to true if current span has a parent span but still considered 'root' for current service diff --git a/dd-trace-api/src/main/java/datadog/trace/api/DDTags.java b/dd-trace-api/src/main/java/datadog/trace/api/DDTags.java index 4f4ae6813c3..786937350c7 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/DDTags.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/DDTags.java @@ -37,6 +37,7 @@ public class DDTags { /** Manually force tracer to keep the trace */ public static final String MANUAL_KEEP = "manual.keep"; + /** Manually force tracer to drop the trace */ public static final String MANUAL_DROP = "manual.drop"; @@ -59,6 +60,22 @@ public class DDTags { public static final String CI_ENV_VARS = "_dd.ci.env_vars"; public static final String CI_ITR_TESTS_SKIPPED = "_dd.ci.itr.tests_skipped"; public static final String TEST_IS_USER_PROVIDED_SERVICE = "_dd.test.is_user_provided_service"; + public static final String LIBRARY_CAPABILITIES_TIA = + "_dd.library_capabilities.test_impact_analysis"; + public static final String LIBRARY_CAPABILITIES_EFD = + "_dd.library_capabilities.early_flake_detection"; + public static final String LIBRARY_CAPABILITIES_ATR = + "_dd.library_capabilities.auto_test_retries"; + public static final String LIBRARY_CAPABILITIES_IMPACTED_TESTS = + "_dd.library_capabilities.impacted_tests"; + public static final String LIBRARY_CAPABILITIES_FAIL_FAST_TEST_ORDER = + "_dd.library_capabilities.fail_fast_test_order"; + public static final String LIBRARY_CAPABILITIES_QUARANTINE = + "_dd.library_capabilities.test_management.quarantine"; + public static final String LIBRARY_CAPABILITIES_DISABLED = + "_dd.library_capabilities.test_management.disable"; + public static final String LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX = + "_dd.library_capabilities.test_management.attempt_to_fix"; public static final String MEASURED = "_dd.measured"; public static final String PID_TAG = "process_id"; public static final String SCHEMA_VERSION_TAG_KEY = "_dd.trace_span_attribute_schema"; diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/InstrumentationBridge.java b/internal-api/src/main/java/datadog/trace/api/civisibility/InstrumentationBridge.java index 18e8cc860cf..8cd91d37fbf 100644 --- a/internal-api/src/main/java/datadog/trace/api/civisibility/InstrumentationBridge.java +++ b/internal-api/src/main/java/datadog/trace/api/civisibility/InstrumentationBridge.java @@ -1,10 +1,12 @@ package datadog.trace.api.civisibility; +import datadog.trace.api.civisibility.config.LibraryCapability; import datadog.trace.api.civisibility.events.BuildEventsHandler; import datadog.trace.api.civisibility.events.TestEventsHandler; import datadog.trace.api.civisibility.telemetry.CiVisibilityMetricCollector; import datadog.trace.api.civisibility.telemetry.NoOpMetricCollector; import datadog.trace.bootstrap.ContextStore; +import java.util.Collection; public abstract class InstrumentationBridge { @@ -23,8 +25,10 @@ public static void registerTestEventsHandlerFactory( public static TestEventsHandler createTestEventsHandler( String component, ContextStore suiteStore, - ContextStore testStore) { - return TEST_EVENTS_HANDLER_FACTORY.create(component, suiteStore, testStore); + ContextStore testStore, + Collection availableCapabilities) { + return TEST_EVENTS_HANDLER_FACTORY.create( + component, suiteStore, testStore, availableCapabilities); } public static void registerBuildEventsHandlerFactory( diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/config/LibraryCapability.java b/internal-api/src/main/java/datadog/trace/api/civisibility/config/LibraryCapability.java new file mode 100644 index 00000000000..a7b786d7cec --- /dev/null +++ b/internal-api/src/main/java/datadog/trace/api/civisibility/config/LibraryCapability.java @@ -0,0 +1,12 @@ +package datadog.trace.api.civisibility.config; + +public enum LibraryCapability { + TIA, + EFD, + ATR, + IMPACTED, + FAIL_FAST, + QUARANTINE, + DISABLED, + ATTEMPT_TO_FIX +} diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestEventsHandler.java b/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestEventsHandler.java index 0d40bb98201..95ad9bf505c 100644 --- a/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestEventsHandler.java +++ b/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestEventsHandler.java @@ -2,6 +2,7 @@ import datadog.trace.api.civisibility.DDTest; import datadog.trace.api.civisibility.DDTestSuite; +import datadog.trace.api.civisibility.config.LibraryCapability; import datadog.trace.api.civisibility.config.TestIdentifier; import datadog.trace.api.civisibility.config.TestSourceData; import datadog.trace.api.civisibility.execution.TestExecutionHistory; @@ -110,6 +111,7 @@ interface Factory { TestEventsHandler create( String component, @Nullable ContextStore suiteStore, - @Nullable ContextStore testStore); + @Nullable ContextStore testStore, + Collection availableCapabilities); } } From 2b25ea8cd57ca0c71938579f25bfcecb9961068f Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Fri, 28 Feb 2025 11:15:42 +0100 Subject: [PATCH 15/41] update weaver instrumentation --- .../weaver/DatadogWeaverReporter.java | 4 ++- .../weaver/WeaverInstrumentation.java | 2 +- .../instrumentation/weaver/WeaverUtils.java | 7 +++++ .../weaver/src/test/groovy/WeaverTest.groovy | 30 +++++++++++++++++++ 4 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dd-java-agent/instrumentation/weaver/src/main/java/datadog/trace/instrumentation/weaver/DatadogWeaverReporter.java b/dd-java-agent/instrumentation/weaver/src/main/java/datadog/trace/instrumentation/weaver/DatadogWeaverReporter.java index 19b59a1370e..3141e04c0ad 100644 --- a/dd-java-agent/instrumentation/weaver/src/main/java/datadog/trace/instrumentation/weaver/DatadogWeaverReporter.java +++ b/dd-java-agent/instrumentation/weaver/src/main/java/datadog/trace/instrumentation/weaver/DatadogWeaverReporter.java @@ -38,7 +38,9 @@ public class DatadogWeaverReporter { public static synchronized void start() { if (TEST_EVENTS_HANDLER == null) { - TEST_EVENTS_HANDLER = InstrumentationBridge.createTestEventsHandler("weaver", null, null); + TEST_EVENTS_HANDLER = + InstrumentationBridge.createTestEventsHandler( + "weaver", null, null, WeaverUtils.availableCapabilities()); } } diff --git a/dd-java-agent/instrumentation/weaver/src/main/java/datadog/trace/instrumentation/weaver/WeaverInstrumentation.java b/dd-java-agent/instrumentation/weaver/src/main/java/datadog/trace/instrumentation/weaver/WeaverInstrumentation.java index e432561af02..013aa56cc63 100644 --- a/dd-java-agent/instrumentation/weaver/src/main/java/datadog/trace/instrumentation/weaver/WeaverInstrumentation.java +++ b/dd-java-agent/instrumentation/weaver/src/main/java/datadog/trace/instrumentation/weaver/WeaverInstrumentation.java @@ -26,9 +26,9 @@ public String instrumentedType() { @Override public String[] helperClassNames() { return new String[] { + packageName + ".WeaverUtils", packageName + ".DatadogWeaverReporter", packageName + ".TaskDefAwareQueueProxy", - packageName + ".WeaverUtils", }; } diff --git a/dd-java-agent/instrumentation/weaver/src/main/java/datadog/trace/instrumentation/weaver/WeaverUtils.java b/dd-java-agent/instrumentation/weaver/src/main/java/datadog/trace/instrumentation/weaver/WeaverUtils.java index f86e95212ae..3ca154c92a3 100644 --- a/dd-java-agent/instrumentation/weaver/src/main/java/datadog/trace/instrumentation/weaver/WeaverUtils.java +++ b/dd-java-agent/instrumentation/weaver/src/main/java/datadog/trace/instrumentation/weaver/WeaverUtils.java @@ -1,7 +1,10 @@ package datadog.trace.instrumentation.weaver; +import datadog.trace.api.civisibility.config.LibraryCapability; import java.io.InputStream; import java.net.URL; +import java.util.Collections; +import java.util.List; import java.util.Properties; import javax.annotation.Nullable; import org.slf4j.Logger; @@ -49,4 +52,8 @@ public static Class getClass(String className) { return null; } } + + public static List availableCapabilities() { + return Collections.emptyList(); + } } diff --git a/dd-java-agent/instrumentation/weaver/src/test/groovy/WeaverTest.groovy b/dd-java-agent/instrumentation/weaver/src/test/groovy/WeaverTest.groovy index 736df932da7..bef4d7838bd 100644 --- a/dd-java-agent/instrumentation/weaver/src/test/groovy/WeaverTest.groovy +++ b/dd-java-agent/instrumentation/weaver/src/test/groovy/WeaverTest.groovy @@ -1,5 +1,9 @@ +import datadog.trace.agent.test.asserts.ListWriterAssert +import datadog.trace.api.DDSpanTypes +import datadog.trace.api.DDTags import datadog.trace.api.DisableTestTrace import datadog.trace.civisibility.CiVisibilityInstrumentationTest +import datadog.trace.civisibility.CiVisibilityTestUtils import datadog.trace.instrumentation.weaver.DatadogWeaverReporter import datadog.trace.instrumentation.weaver.WeaverIntegrationTestRunner import datadog.trace.instrumentation.weaver.WeaverUtils @@ -34,6 +38,32 @@ class WeaverTest extends CiVisibilityInstrumentationTest { "test-succeed-global-resource" | [TestSucceedGlobalResource] } + def "test capabilities tagging"() { + setup: + runTests([TestSucceed]) + + expect: + ListWriterAssert.assertTraces(TEST_WRITER, 4, true, new CiVisibilityTestUtils.SortTracesByType(), { + trace(1) { + span(0) { + spanType DDSpanTypes.TEST_SESSION_END + tags(false) { + areNotPresent([ + DDTags.LIBRARY_CAPABILITIES_TIA, + DDTags.LIBRARY_CAPABILITIES_EFD, + DDTags.LIBRARY_CAPABILITIES_ATR, + DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS, + DDTags.LIBRARY_CAPABILITIES_FAIL_FAST_TEST_ORDER, + DDTags.LIBRARY_CAPABILITIES_QUARANTINE, + DDTags.LIBRARY_CAPABILITIES_DISABLED, + DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX + ]) + } + } + } + }) + } + @Override String instrumentedLibraryName() { return "weaver" From ef2664d6657823e244b90c70ac0db01de0ddeca0 Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Fri, 28 Feb 2025 11:15:58 +0100 Subject: [PATCH 16/41] update karate instrumentation --- .../instrumentation/karate/build.gradle | 2 + .../KarateExecutionInstrumentation.java | 2 +- .../karate/KarateInstrumentation.java | 2 +- .../karate/KarateTracingHook.java | 4 +- .../instrumentation/karate/KarateUtils.java | 31 ++++++++++ .../karate/TestEventsHandlerHolder.java | 7 ++- .../karate/src/test/groovy/KarateTest.groovy | 59 +++++++++++++++---- 7 files changed, 90 insertions(+), 17 deletions(-) diff --git a/dd-java-agent/instrumentation/karate/build.gradle b/dd-java-agent/instrumentation/karate/build.gradle index 2832208a3f2..53355530876 100644 --- a/dd-java-agent/instrumentation/karate/build.gradle +++ b/dd-java-agent/instrumentation/karate/build.gradle @@ -26,10 +26,12 @@ addTestSuiteForDir('karate131Test', 'test') dependencies { compileOnly group: 'com.intuit.karate', name: 'karate-core', version: '1.0.0' + compileOnly group: 'org.apache.maven', name: 'maven-artifact', version: '3.9.9' testImplementation testFixtures(project(':dd-java-agent:agent-ci-visibility')) testImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.8.2' testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.8.2' + testImplementation group: 'org.apache.maven', name: 'maven-artifact', version: '3.9.9' testImplementation (group: 'com.intuit.karate', name: 'karate-core', version: '1.0.0') { // excluding logback to avoid conflicts with libs.bundles.test.logging diff --git a/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateExecutionInstrumentation.java b/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateExecutionInstrumentation.java index 6f02d49d039..159d323d265 100644 --- a/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateExecutionInstrumentation.java +++ b/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateExecutionInstrumentation.java @@ -47,8 +47,8 @@ public String[] knownMatchingTypes() { @Override public String[] helperClassNames() { return new String[] { - packageName + ".TestEventsHandlerHolder", packageName + ".KarateUtils", + packageName + ".TestEventsHandlerHolder", packageName + ".KarateTracingHook", packageName + ".ExecutionContext" }; diff --git a/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateInstrumentation.java b/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateInstrumentation.java index e1bead7a500..bcc14ce5553 100644 --- a/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateInstrumentation.java +++ b/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateInstrumentation.java @@ -30,8 +30,8 @@ public String instrumentedType() { @Override public String[] helperClassNames() { return new String[] { - packageName + ".TestEventsHandlerHolder", packageName + ".KarateUtils", + packageName + ".TestEventsHandlerHolder", packageName + ".KarateTracingHook" }; } diff --git a/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateTracingHook.java b/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateTracingHook.java index c81b8c0d1da..47b7484b772 100644 --- a/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateTracingHook.java +++ b/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateTracingHook.java @@ -33,8 +33,8 @@ public class KarateTracingHook implements RuntimeHook { private static final String FRAMEWORK_NAME = "karate"; - private static final String FRAMEWORK_VERSION = FileUtils.KARATE_VERSION; - private static final String KARATE_STEP_SPAN_NAME = "karate.step"; + public static final String FRAMEWORK_VERSION = FileUtils.KARATE_VERSION; + public static final String KARATE_STEP_SPAN_NAME = "karate.step"; private final ContextStore manualFeatureHooks; diff --git a/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateUtils.java b/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateUtils.java index d96697a2c63..afea0b02ca0 100644 --- a/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateUtils.java +++ b/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateUtils.java @@ -9,6 +9,7 @@ import com.intuit.karate.core.ScenarioResult; import com.intuit.karate.core.ScenarioRuntime; import com.intuit.karate.core.Tag; +import datadog.trace.api.civisibility.config.LibraryCapability; import datadog.trace.api.civisibility.config.TestIdentifier; import datadog.trace.api.civisibility.events.TestDescriptor; import datadog.trace.api.civisibility.events.TestSuiteDescriptor; @@ -16,8 +17,10 @@ import datadog.trace.util.Strings; import java.lang.invoke.MethodHandle; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.List; +import org.apache.maven.artifact.versioning.ComparableVersion; public abstract class KarateUtils { @@ -45,6 +48,9 @@ private KarateUtils() {} private static final MethodHandle SCENARIO_RUNTIME_RESULT_SETTER = METHOD_HANDLES.privateFieldSetter(ScenarioRuntime.class, "result"); + private static final ComparableVersion karateV12 = new ComparableVersion("1.2.0"); + private static final ComparableVersion karateV13 = new ComparableVersion("1.3.0"); + public static Feature getFeature(FeatureRuntime featureRuntime) { if (FEATURE_RUNTIME_FEATURE_CALL_GETTER != null) { Object featureCall = @@ -131,4 +137,29 @@ public static void resetBeforeHook(FeatureRuntime featureRuntime) { public static void setResult(ScenarioRuntime runtime, ScenarioResult result) { METHOD_HANDLES.invoke(SCENARIO_RUNTIME_RESULT_SETTER, runtime, result); } + + public static boolean isSkippingSupported(String frameworkVersion) { + return karateV12.compareTo(new ComparableVersion(frameworkVersion)) <= 0; + } + + public static boolean isSetupTagSupported(String frameworkVersion) { + return karateV13.compareTo(new ComparableVersion(frameworkVersion)) <= 0; + } + + public static List availableCapabilities(String frameworkVersion) { + List baseCapabilities = + new ArrayList<>( + Arrays.asList( + LibraryCapability.ATR, + LibraryCapability.EFD, + LibraryCapability.QUARANTINE, + LibraryCapability.ATTEMPT_TO_FIX)); + + if (isSkippingSupported(frameworkVersion)) { + baseCapabilities.add(LibraryCapability.TIA); + baseCapabilities.add(LibraryCapability.DISABLED); + } + + return baseCapabilities; + } } diff --git a/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/TestEventsHandlerHolder.java b/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/TestEventsHandlerHolder.java index 97777f8ff66..1f293994737 100644 --- a/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/TestEventsHandlerHolder.java +++ b/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/TestEventsHandlerHolder.java @@ -21,7 +21,12 @@ public abstract class TestEventsHandlerHolder { } public static void start() { - TEST_EVENTS_HANDLER = InstrumentationBridge.createTestEventsHandler("karate", null, null); + TEST_EVENTS_HANDLER = + InstrumentationBridge.createTestEventsHandler( + "karate", + null, + null, + KarateUtils.availableCapabilities(KarateTracingHook.FRAMEWORK_VERSION)); } public static void stop() { diff --git a/dd-java-agent/instrumentation/karate/src/test/groovy/KarateTest.groovy b/dd-java-agent/instrumentation/karate/src/test/groovy/KarateTest.groovy index f1c372976ce..24c5e87406e 100644 --- a/dd-java-agent/instrumentation/karate/src/test/groovy/KarateTest.groovy +++ b/dd-java-agent/instrumentation/karate/src/test/groovy/KarateTest.groovy @@ -1,8 +1,14 @@ import com.intuit.karate.FileUtils +import datadog.trace.agent.test.asserts.ListWriterAssert +import datadog.trace.api.DDSpanTypes +import datadog.trace.api.DDTags import datadog.trace.api.DisableTestTrace import datadog.trace.api.civisibility.config.TestFQN import datadog.trace.api.civisibility.config.TestIdentifier import datadog.trace.civisibility.CiVisibilityInstrumentationTest +import datadog.trace.civisibility.CiVisibilityTestUtils +import datadog.trace.civisibility.config.LibraryCapabilityUtils +import datadog.trace.instrumentation.karate.KarateUtils import datadog.trace.instrumentation.karate.TestEventsHandlerHolder import org.example.* import org.junit.jupiter.api.Assumptions @@ -33,7 +39,7 @@ class KarateTest extends CiVisibilityInstrumentationTest { testcaseName | success | tests | assumption "test-succeed" | true | [TestSucceedKarate] | true "test-succeed-parallel" | true | [TestSucceedParallelKarate] | true - "test-with-setup" | true | [TestWithSetupKarate] | isSetupTagSupported(FileUtils.KARATE_VERSION) + "test-with-setup" | true | [TestWithSetupKarate] | KarateUtils.isSetupTagSupported(FileUtils.KARATE_VERSION) "test-parameterized" | true | [TestParameterizedKarate] | true "test-failed" | false | [TestFailedKarate] | true "test-skipped-feature" | true | [TestSkippedFeatureKarate] | true @@ -41,7 +47,7 @@ class KarateTest extends CiVisibilityInstrumentationTest { } def "test ITR #testcaseName"() { - Assumptions.assumeTrue(isSkippingSupported(FileUtils.KARATE_VERSION)) + Assumptions.assumeTrue(KarateUtils.isSkippingSupported(FileUtils.KARATE_VERSION)) givenSkippableTests(skippedTests) @@ -142,7 +148,7 @@ class KarateTest extends CiVisibilityInstrumentationTest { } def "test disabled #testcaseName"() { - Assumptions.assumeTrue(isSkippingSupported(FileUtils.KARATE_VERSION)) + Assumptions.assumeTrue(KarateUtils.isSkippingSupported(FileUtils.KARATE_VERSION)) givenDisabledTests(disabled) @@ -174,6 +180,44 @@ class KarateTest extends CiVisibilityInstrumentationTest { "test-attempt-to-fix-disabled-succeeded" | true | [TestSucceedKarate] | [new TestFQN("[org/example/test_succeed] test succeed", "first scenario")] | [] | [new TestFQN("[org/example/test_succeed] test succeed", "first scenario")] } + def "test capabilities tagging #testcaseName"() { + Assumptions.assumeTrue(assumption) + + def notPresentTags = new HashSet<>(LibraryCapabilityUtils.CAPABILITY_TAG_MAP.values()) + notPresentTags.removeAll(presentTags) + + runTests([TestSucceedOneCaseKarate], true) + + ListWriterAssert.assertTraces(TEST_WRITER, 5, true, new CiVisibilityTestUtils.SortTracesByType(), { + trace(1) { + span(0) { + spanType DDSpanTypes.TEST_SESSION_END + tags(false) { + arePresent(presentTags) + areNotPresent(notPresentTags) + } + } + } + }) + + where: + testcaseName | presentTags | assumption + "test-capabilities-base" | [ + DDTags.LIBRARY_CAPABILITIES_ATR, + DDTags.LIBRARY_CAPABILITIES_EFD, + DDTags.LIBRARY_CAPABILITIES_QUARANTINE, + DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX + ] | !KarateUtils.isSkippingSupported(FileUtils.KARATE_VERSION) + "test-capabilities-skipping" | [ + DDTags.LIBRARY_CAPABILITIES_ATR, + DDTags.LIBRARY_CAPABILITIES_EFD, + DDTags.LIBRARY_CAPABILITIES_QUARANTINE, + DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX, + DDTags.LIBRARY_CAPABILITIES_TIA, + DDTags.LIBRARY_CAPABILITIES_DISABLED + ] | KarateUtils.isSkippingSupported(FileUtils.KARATE_VERSION) + } + private void runTests(List> tests, boolean expectSuccess = true) { TestEventsHandlerHolder.start() @@ -223,15 +267,6 @@ class KarateTest extends CiVisibilityInstrumentationTest { return FileUtils.KARATE_VERSION } - boolean isSkippingSupported(String frameworkVersion) { - // earlier Karate version contain a bug that does not allow skipping scenarios - frameworkVersion >= "1.2.0" - } - - boolean isSetupTagSupported(String frameworkVersion) { - frameworkVersion >= "1.3.0" - } - private static final class TestResultListener implements TestExecutionListener { private final Map> testsByStatus = new ConcurrentHashMap<>() From 35382878e178e6ec2b976c141f16222afde6bc07 Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Fri, 28 Feb 2025 11:24:39 +0100 Subject: [PATCH 17/41] unify karate version in KarateUtils --- .../instrumentation/karate/KarateTracingHook.java | 3 +-- .../trace/instrumentation/karate/KarateUtils.java | 5 +++++ .../karate/src/test/groovy/KarateTest.groovy | 12 ++++++------ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateTracingHook.java b/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateTracingHook.java index 47b7484b772..b97739cd237 100644 --- a/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateTracingHook.java +++ b/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateTracingHook.java @@ -1,6 +1,5 @@ package datadog.trace.instrumentation.karate; -import com.intuit.karate.FileUtils; import com.intuit.karate.KarateException; import com.intuit.karate.RuntimeHook; import com.intuit.karate.Suite; @@ -33,7 +32,7 @@ public class KarateTracingHook implements RuntimeHook { private static final String FRAMEWORK_NAME = "karate"; - public static final String FRAMEWORK_VERSION = FileUtils.KARATE_VERSION; + public static final String FRAMEWORK_VERSION = KarateUtils.getKarateVersion(); public static final String KARATE_STEP_SPAN_NAME = "karate.step"; private final ContextStore manualFeatureHooks; diff --git a/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateUtils.java b/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateUtils.java index afea0b02ca0..73daf97c314 100644 --- a/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateUtils.java +++ b/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateUtils.java @@ -2,6 +2,7 @@ import static datadog.json.JsonMapper.toJson; +import com.intuit.karate.FileUtils; import com.intuit.karate.core.Feature; import com.intuit.karate.core.FeatureRuntime; import com.intuit.karate.core.Result; @@ -138,6 +139,10 @@ public static void setResult(ScenarioRuntime runtime, ScenarioResult result) { METHOD_HANDLES.invoke(SCENARIO_RUNTIME_RESULT_SETTER, runtime, result); } + public static String getKarateVersion() { + return FileUtils.KARATE_VERSION; + } + public static boolean isSkippingSupported(String frameworkVersion) { return karateV12.compareTo(new ComparableVersion(frameworkVersion)) <= 0; } diff --git a/dd-java-agent/instrumentation/karate/src/test/groovy/KarateTest.groovy b/dd-java-agent/instrumentation/karate/src/test/groovy/KarateTest.groovy index 24c5e87406e..8394a4ea957 100644 --- a/dd-java-agent/instrumentation/karate/src/test/groovy/KarateTest.groovy +++ b/dd-java-agent/instrumentation/karate/src/test/groovy/KarateTest.groovy @@ -39,7 +39,7 @@ class KarateTest extends CiVisibilityInstrumentationTest { testcaseName | success | tests | assumption "test-succeed" | true | [TestSucceedKarate] | true "test-succeed-parallel" | true | [TestSucceedParallelKarate] | true - "test-with-setup" | true | [TestWithSetupKarate] | KarateUtils.isSetupTagSupported(FileUtils.KARATE_VERSION) + "test-with-setup" | true | [TestWithSetupKarate] | KarateUtils.isSetupTagSupported(KarateUtils.getKarateVersion()) "test-parameterized" | true | [TestParameterizedKarate] | true "test-failed" | false | [TestFailedKarate] | true "test-skipped-feature" | true | [TestSkippedFeatureKarate] | true @@ -47,7 +47,7 @@ class KarateTest extends CiVisibilityInstrumentationTest { } def "test ITR #testcaseName"() { - Assumptions.assumeTrue(KarateUtils.isSkippingSupported(FileUtils.KARATE_VERSION)) + Assumptions.assumeTrue(KarateUtils.isSkippingSupported(KarateUtils.getKarateVersion())) givenSkippableTests(skippedTests) @@ -148,7 +148,7 @@ class KarateTest extends CiVisibilityInstrumentationTest { } def "test disabled #testcaseName"() { - Assumptions.assumeTrue(KarateUtils.isSkippingSupported(FileUtils.KARATE_VERSION)) + Assumptions.assumeTrue(KarateUtils.isSkippingSupported(KarateUtils.getKarateVersion())) givenDisabledTests(disabled) @@ -207,7 +207,7 @@ class KarateTest extends CiVisibilityInstrumentationTest { DDTags.LIBRARY_CAPABILITIES_EFD, DDTags.LIBRARY_CAPABILITIES_QUARANTINE, DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX - ] | !KarateUtils.isSkippingSupported(FileUtils.KARATE_VERSION) + ] | !KarateUtils.isSkippingSupported(KarateUtils.getKarateVersion()) "test-capabilities-skipping" | [ DDTags.LIBRARY_CAPABILITIES_ATR, DDTags.LIBRARY_CAPABILITIES_EFD, @@ -215,7 +215,7 @@ class KarateTest extends CiVisibilityInstrumentationTest { DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX, DDTags.LIBRARY_CAPABILITIES_TIA, DDTags.LIBRARY_CAPABILITIES_DISABLED - ] | KarateUtils.isSkippingSupported(FileUtils.KARATE_VERSION) + ] | KarateUtils.isSkippingSupported(KarateUtils.getKarateVersion()) } private void runTests(List> tests, boolean expectSuccess = true) { @@ -264,7 +264,7 @@ class KarateTest extends CiVisibilityInstrumentationTest { @Override String instrumentedLibraryVersion() { - return FileUtils.KARATE_VERSION + return KarateUtils.getKarateVersion() } private static final class TestResultListener implements TestExecutionListener { From a52cc21b124e5c423bf8eec2b50ff0eca82f7e99 Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Fri, 28 Feb 2025 12:51:27 +0100 Subject: [PATCH 18/41] update testng instrumentation --- .../instrumentation/testng/build.gradle | 1 + .../testng/TestEventsHandlerHolder.java | 7 +- .../instrumentation/testng/TestNGUtils.java | 34 ++++++++ .../instrumentation/testng/TestNGTest.groovy | 77 +++++++++++++++---- 4 files changed, 103 insertions(+), 16 deletions(-) diff --git a/dd-java-agent/instrumentation/testng/build.gradle b/dd-java-agent/instrumentation/testng/build.gradle index dc239f8b9b6..2b5bda6c64a 100644 --- a/dd-java-agent/instrumentation/testng/build.gradle +++ b/dd-java-agent/instrumentation/testng/build.gradle @@ -6,6 +6,7 @@ apply from: "$rootDir/gradle/java.gradle" dependencies { compileOnly group: 'org.testng', name: 'testng', version: '6.4' + compileOnly group: 'org.apache.maven', name: 'maven-artifact', version: '3.9.9' testFixturesApi testFixtures(project(':dd-java-agent:agent-ci-visibility')) diff --git a/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestEventsHandlerHolder.java b/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestEventsHandlerHolder.java index 41835553f5a..f791466d41e 100644 --- a/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestEventsHandlerHolder.java +++ b/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestEventsHandlerHolder.java @@ -30,7 +30,12 @@ public static synchronized void setContextStore(ContextStore getTestClass(final ITestResult result) { IClass testClass = result.getTestClass(); if (testClass == null) { @@ -256,4 +260,34 @@ public static TestSuiteDescriptor toSuiteDescriptor(ITestClass testClass) { Class testSuiteClass = testClass.getRealClass(); return new TestSuiteDescriptor(testSuiteName, testSuiteClass); } + + public static boolean isEFDSupported(String version) { + return testNGv75.compareTo(new ComparableVersion(version)) <= 0; + } + + public static boolean isExceptionSuppressionSupported(String version) { + return testNGv75.compareTo(new ComparableVersion(version)) <= 0; + } + + public static List availableCapabilities(String version) { + List baseCapabilities = + new ArrayList<>( + Arrays.asList( + LibraryCapability.TIA, LibraryCapability.IMPACTED, LibraryCapability.DISABLED)); + + boolean isEFDSupported = isEFDSupported(version); + boolean isExceptionSuppressionSupported = isExceptionSuppressionSupported(version); + if (isExceptionSuppressionSupported) { + baseCapabilities.add(LibraryCapability.ATR); + baseCapabilities.add(LibraryCapability.QUARANTINE); + } + if (isEFDSupported) { + baseCapabilities.add(LibraryCapability.EFD); + } + if (isExceptionSuppressionSupported && isEFDSupported) { + baseCapabilities.add(LibraryCapability.ATTEMPT_TO_FIX); + } + + return baseCapabilities; + } } diff --git a/dd-java-agent/instrumentation/testng/src/testFixtures/groovy/datadog/trace/instrumentation/testng/TestNGTest.groovy b/dd-java-agent/instrumentation/testng/src/testFixtures/groovy/datadog/trace/instrumentation/testng/TestNGTest.groovy index 636b3a6e07f..b07db8cbc16 100644 --- a/dd-java-agent/instrumentation/testng/src/testFixtures/groovy/datadog/trace/instrumentation/testng/TestNGTest.groovy +++ b/dd-java-agent/instrumentation/testng/src/testFixtures/groovy/datadog/trace/instrumentation/testng/TestNGTest.groovy @@ -1,9 +1,13 @@ package datadog.trace.instrumentation.testng - +import datadog.trace.agent.test.asserts.ListWriterAssert +import datadog.trace.api.DDSpanTypes +import datadog.trace.api.DDTags import datadog.trace.api.civisibility.config.TestFQN import datadog.trace.api.civisibility.config.TestIdentifier import datadog.trace.civisibility.CiVisibilityInstrumentationTest +import datadog.trace.civisibility.CiVisibilityTestUtils +import datadog.trace.civisibility.config.LibraryCapabilityUtils import datadog.trace.civisibility.diff.FileDiff import datadog.trace.civisibility.diff.LineDiff import org.apache.maven.artifact.versioning.ComparableVersion @@ -17,8 +21,7 @@ abstract class TestNGTest extends CiVisibilityInstrumentationTest { static testOutputDir = "build/tmp/test-output" - static ComparableVersion currentTestNGVersion = new ComparableVersion(TracingListener.FRAMEWORK_VERSION) - static ComparableVersion testNGv75 = new ComparableVersion("7.5") + static currentTestNGVersion = TestNGUtils.getTestNGVersion() static ComparableVersion testNGv70 = new ComparableVersion("7.0") def "test #testcaseName"() { @@ -97,7 +100,7 @@ abstract class TestNGTest extends CiVisibilityInstrumentationTest { } def "test flaky retries #testcaseName"() { - Assumptions.assumeTrue(isExceptionSuppressionSupported()) + Assumptions.assumeTrue(TestNGUtils.isExceptionSuppressionSupported(currentTestNGVersion)) givenFlakyRetryEnabled(true) givenFlakyTests(retriedTests) @@ -116,7 +119,7 @@ abstract class TestNGTest extends CiVisibilityInstrumentationTest { } def "test early flakiness detection #testcaseName"() { - Assumptions.assumeTrue(isEFDSupported()) + Assumptions.assumeTrue(TestNGUtils.isEFDSupported(currentTestNGVersion)) givenEarlyFlakinessDetectionEnabled(true) givenKnownTests(knownTestsList) @@ -158,7 +161,7 @@ abstract class TestNGTest extends CiVisibilityInstrumentationTest { } def "test quarantined #testcaseName"() { - Assumptions.assumeTrue(isExceptionSuppressionSupported()) + Assumptions.assumeTrue(TestNGUtils.isExceptionSuppressionSupported(currentTestNGVersion)) givenQuarantinedTests(quarantined) @@ -173,7 +176,7 @@ abstract class TestNGTest extends CiVisibilityInstrumentationTest { } def "test quarantined auto-retries #testcaseName"() { - Assumptions.assumeTrue(isExceptionSuppressionSupported()) + Assumptions.assumeTrue(TestNGUtils.isExceptionSuppressionSupported(currentTestNGVersion)) givenQuarantinedTests(quarantined) @@ -191,7 +194,7 @@ abstract class TestNGTest extends CiVisibilityInstrumentationTest { } def "test quarantined early flakiness detection #testcaseName"() { - Assumptions.assumeTrue(isExceptionSuppressionSupported()) + Assumptions.assumeTrue(TestNGUtils.isExceptionSuppressionSupported(currentTestNGVersion)) givenQuarantinedTests(quarantined) @@ -223,7 +226,8 @@ abstract class TestNGTest extends CiVisibilityInstrumentationTest { } def "test attempt to fix #testcaseName"() { - Assumptions.assumeTrue(isExceptionSuppressionSupported()) + Assumptions.assumeTrue(TestNGUtils.isExceptionSuppressionSupported(currentTestNGVersion)) + Assumptions.assumeTrue(TestNGUtils.isEFDSupported(currentTestNGVersion)) givenQuarantinedTests(quarantined) givenDisabledTests(disabled) @@ -242,7 +246,7 @@ abstract class TestNGTest extends CiVisibilityInstrumentationTest { "test-attempt-to-fix-disabled-failed" | true | [TestFailed] | [new TestFQN("org.example.TestFailed", "test_failed")] | [] | [new TestFQN("org.example.TestFailed", "test_failed")] "test-attempt-to-fix-disabled-succeeded" | true | [TestSucceed] | [new TestFQN("org.example.TestSucceed", "test_succeed")] | [] | [new TestFQN("org.example.TestSucceed", "test_succeed")] } - + def "test known tests ordering #testcaseName"() { Assumptions.assumeTrue(isTestOrderingSupported()) @@ -270,12 +274,55 @@ abstract class TestNGTest extends CiVisibilityInstrumentationTest { ] } - private static boolean isEFDSupported() { - currentTestNGVersion >= testNGv75 - } + def "test capabilities tagging #testcaseName"() { + Assumptions.assumeTrue(assumption) + + def notPresentTags = new HashSet<>(LibraryCapabilityUtils.CAPABILITY_TAG_MAP.values()) + notPresentTags.removeAll(presentTags) - private static boolean isExceptionSuppressionSupported() { - currentTestNGVersion >= testNGv75 + runTests([TestSucceed], null, true) + + ListWriterAssert.assertTraces(TEST_WRITER, 4, true, new CiVisibilityTestUtils.SortTracesByType(), { + trace(1) { + span(0) { + spanType DDSpanTypes.TEST_SESSION_END + tags(false) { + arePresent(presentTags) + areNotPresent(notPresentTags) + } + } + } + }) + + where: + testcaseName | presentTags | assumption + "test-capabilities-base" | [ + DDTags.LIBRARY_CAPABILITIES_TIA, + DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS, + DDTags.LIBRARY_CAPABILITIES_DISABLED + ] | (!TestNGUtils.isEFDSupported(currentTestNGVersion) && !TestNGUtils.isExceptionSuppressionSupported(currentTestNGVersion)) + "test-capabilities-efd" | [ + DDTags.LIBRARY_CAPABILITIES_TIA, + DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS, + DDTags.LIBRARY_CAPABILITIES_DISABLED, + DDTags.LIBRARY_CAPABILITIES_EFD + ] | (TestNGUtils.isEFDSupported(currentTestNGVersion) && !TestNGUtils.isExceptionSuppressionSupported(currentTestNGVersion)) + "test-capabilities-suppression" | [ + DDTags.LIBRARY_CAPABILITIES_TIA, + DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS, + DDTags.LIBRARY_CAPABILITIES_DISABLED, + DDTags.LIBRARY_CAPABILITIES_ATR, + DDTags.LIBRARY_CAPABILITIES_QUARANTINE + ] | (!TestNGUtils.isEFDSupported(currentTestNGVersion) && TestNGUtils.isExceptionSuppressionSupported(currentTestNGVersion)) + "test-capabilities-efd-and-suppression" | [ + DDTags.LIBRARY_CAPABILITIES_TIA, + DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS, + DDTags.LIBRARY_CAPABILITIES_DISABLED, + DDTags.LIBRARY_CAPABILITIES_EFD, + DDTags.LIBRARY_CAPABILITIES_ATR, + DDTags.LIBRARY_CAPABILITIES_QUARANTINE, + DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX + ] | (TestNGUtils.isEFDSupported(currentTestNGVersion) && TestNGUtils.isExceptionSuppressionSupported(currentTestNGVersion)) } private static boolean isTestOrderingSupported() { From bc0d0b3b71a5c1832e473921c559537c17b97280 Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Fri, 28 Feb 2025 15:37:44 +0100 Subject: [PATCH 19/41] add testng ordering to capabilities --- .../instrumentation/testng/TestNGUtils.java | 8 +++++ .../instrumentation/testng/TestNGTest.groovy | 30 ++++++------------- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGUtils.java b/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGUtils.java index 50d540745ce..bd2490e726f 100644 --- a/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGUtils.java +++ b/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGUtils.java @@ -48,6 +48,7 @@ public abstract class TestNGUtils { METHOD_HANDLES.method(ITestNGMethod.class, "getRetryAnalyzer"); private static final ComparableVersion testNGv75 = new ComparableVersion("7.5"); + private static final ComparableVersion testNGv70 = new ComparableVersion("7.0"); private static Class getTestClass(final ITestResult result) { IClass testClass = result.getTestClass(); @@ -269,6 +270,10 @@ public static boolean isExceptionSuppressionSupported(String version) { return testNGv75.compareTo(new ComparableVersion(version)) <= 0; } + public static boolean isTestOrderingSupported(String version) { + return testNGv70.compareTo(new ComparableVersion(version)) <= 0; + } + public static List availableCapabilities(String version) { List baseCapabilities = new ArrayList<>( @@ -287,6 +292,9 @@ public static List availableCapabilities(String version) { if (isExceptionSuppressionSupported && isEFDSupported) { baseCapabilities.add(LibraryCapability.ATTEMPT_TO_FIX); } + if (isTestOrderingSupported(version)) { + baseCapabilities.add(LibraryCapability.FAIL_FAST); + } return baseCapabilities; } diff --git a/dd-java-agent/instrumentation/testng/src/testFixtures/groovy/datadog/trace/instrumentation/testng/TestNGTest.groovy b/dd-java-agent/instrumentation/testng/src/testFixtures/groovy/datadog/trace/instrumentation/testng/TestNGTest.groovy index b07db8cbc16..1621e7969bb 100644 --- a/dd-java-agent/instrumentation/testng/src/testFixtures/groovy/datadog/trace/instrumentation/testng/TestNGTest.groovy +++ b/dd-java-agent/instrumentation/testng/src/testFixtures/groovy/datadog/trace/instrumentation/testng/TestNGTest.groovy @@ -10,7 +10,6 @@ import datadog.trace.civisibility.CiVisibilityTestUtils import datadog.trace.civisibility.config.LibraryCapabilityUtils import datadog.trace.civisibility.diff.FileDiff import datadog.trace.civisibility.diff.LineDiff -import org.apache.maven.artifact.versioning.ComparableVersion import org.example.* import org.junit.jupiter.api.Assumptions import org.testng.TestNG @@ -22,7 +21,6 @@ abstract class TestNGTest extends CiVisibilityInstrumentationTest { static testOutputDir = "build/tmp/test-output" static currentTestNGVersion = TestNGUtils.getTestNGVersion() - static ComparableVersion testNGv70 = new ComparableVersion("7.0") def "test #testcaseName"() { runTests(tests, null, success) @@ -246,9 +244,9 @@ abstract class TestNGTest extends CiVisibilityInstrumentationTest { "test-attempt-to-fix-disabled-failed" | true | [TestFailed] | [new TestFQN("org.example.TestFailed", "test_failed")] | [] | [new TestFQN("org.example.TestFailed", "test_failed")] "test-attempt-to-fix-disabled-succeeded" | true | [TestSucceed] | [new TestFQN("org.example.TestSucceed", "test_succeed")] | [] | [new TestFQN("org.example.TestSucceed", "test_succeed")] } - + def "test known tests ordering #testcaseName"() { - Assumptions.assumeTrue(isTestOrderingSupported()) + Assumptions.assumeTrue(TestNGUtils.isTestOrderingSupported(currentTestNGVersion)) givenKnownTests(knownTestsList) @@ -300,33 +298,23 @@ abstract class TestNGTest extends CiVisibilityInstrumentationTest { DDTags.LIBRARY_CAPABILITIES_TIA, DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS, DDTags.LIBRARY_CAPABILITIES_DISABLED - ] | (!TestNGUtils.isEFDSupported(currentTestNGVersion) && !TestNGUtils.isExceptionSuppressionSupported(currentTestNGVersion)) - "test-capabilities-efd" | [ + ] | (!TestNGUtils.isTestOrderingSupported(currentTestNGVersion) && !TestNGUtils.isEFDSupported(currentTestNGVersion) && !TestNGUtils.isExceptionSuppressionSupported(currentTestNGVersion)) + "test-capabilities-ordering" | [ DDTags.LIBRARY_CAPABILITIES_TIA, DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS, DDTags.LIBRARY_CAPABILITIES_DISABLED, - DDTags.LIBRARY_CAPABILITIES_EFD - ] | (TestNGUtils.isEFDSupported(currentTestNGVersion) && !TestNGUtils.isExceptionSuppressionSupported(currentTestNGVersion)) - "test-capabilities-suppression" | [ - DDTags.LIBRARY_CAPABILITIES_TIA, - DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS, - DDTags.LIBRARY_CAPABILITIES_DISABLED, - DDTags.LIBRARY_CAPABILITIES_ATR, - DDTags.LIBRARY_CAPABILITIES_QUARANTINE - ] | (!TestNGUtils.isEFDSupported(currentTestNGVersion) && TestNGUtils.isExceptionSuppressionSupported(currentTestNGVersion)) - "test-capabilities-efd-and-suppression" | [ + DDTags.LIBRARY_CAPABILITIES_FAIL_FAST_TEST_ORDER + ] | (TestNGUtils.isTestOrderingSupported(currentTestNGVersion) && !TestNGUtils.isEFDSupported(currentTestNGVersion) && !TestNGUtils.isExceptionSuppressionSupported(currentTestNGVersion)) + "test-capabilities-ordering-efd-suppression" | [ DDTags.LIBRARY_CAPABILITIES_TIA, DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS, DDTags.LIBRARY_CAPABILITIES_DISABLED, + DDTags.LIBRARY_CAPABILITIES_FAIL_FAST_TEST_ORDER, DDTags.LIBRARY_CAPABILITIES_EFD, DDTags.LIBRARY_CAPABILITIES_ATR, DDTags.LIBRARY_CAPABILITIES_QUARANTINE, DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX - ] | (TestNGUtils.isEFDSupported(currentTestNGVersion) && TestNGUtils.isExceptionSuppressionSupported(currentTestNGVersion)) - } - - private static boolean isTestOrderingSupported() { - currentTestNGVersion >= testNGv70 + ] | (TestNGUtils.isTestOrderingSupported(currentTestNGVersion) && TestNGUtils.isEFDSupported(currentTestNGVersion) && TestNGUtils.isExceptionSuppressionSupported(currentTestNGVersion)) } protected void runTests(List testClasses, String parallelMode = null, boolean expectSuccess = true) { From c9a0114737b0cd699a54645994e703e86f0ba32f Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Fri, 28 Feb 2025 16:57:59 +0100 Subject: [PATCH 20/41] backport ComparableVersion from maven artifact to avoid packaging it --- .../instrumentation/karate/build.gradle | 1 - .../instrumentation/karate/KarateUtils.java | 2 +- .../instrumentation/testng/build.gradle | 1 - .../instrumentation/testng/TestNGUtils.java | 3 +- internal-api/build.gradle | 1 + .../datadog/trace/util/ComparableVersion.java | 518 ++++++++++++++++++ 6 files changed, 522 insertions(+), 4 deletions(-) create mode 100644 internal-api/src/main/java/datadog/trace/util/ComparableVersion.java diff --git a/dd-java-agent/instrumentation/karate/build.gradle b/dd-java-agent/instrumentation/karate/build.gradle index 53355530876..05314c19173 100644 --- a/dd-java-agent/instrumentation/karate/build.gradle +++ b/dd-java-agent/instrumentation/karate/build.gradle @@ -26,7 +26,6 @@ addTestSuiteForDir('karate131Test', 'test') dependencies { compileOnly group: 'com.intuit.karate', name: 'karate-core', version: '1.0.0' - compileOnly group: 'org.apache.maven', name: 'maven-artifact', version: '3.9.9' testImplementation testFixtures(project(':dd-java-agent:agent-ci-visibility')) testImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.8.2' diff --git a/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateUtils.java b/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateUtils.java index 73daf97c314..1366fddc24c 100644 --- a/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateUtils.java +++ b/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateUtils.java @@ -14,6 +14,7 @@ import datadog.trace.api.civisibility.config.TestIdentifier; import datadog.trace.api.civisibility.events.TestDescriptor; import datadog.trace.api.civisibility.events.TestSuiteDescriptor; +import datadog.trace.util.ComparableVersion; import datadog.trace.util.MethodHandles; import datadog.trace.util.Strings; import java.lang.invoke.MethodHandle; @@ -21,7 +22,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.apache.maven.artifact.versioning.ComparableVersion; public abstract class KarateUtils { diff --git a/dd-java-agent/instrumentation/testng/build.gradle b/dd-java-agent/instrumentation/testng/build.gradle index 2b5bda6c64a..dc239f8b9b6 100644 --- a/dd-java-agent/instrumentation/testng/build.gradle +++ b/dd-java-agent/instrumentation/testng/build.gradle @@ -6,7 +6,6 @@ apply from: "$rootDir/gradle/java.gradle" dependencies { compileOnly group: 'org.testng', name: 'testng', version: '6.4' - compileOnly group: 'org.apache.maven', name: 'maven-artifact', version: '3.9.9' testFixturesApi testFixtures(project(':dd-java-agent:agent-ci-visibility')) diff --git a/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGUtils.java b/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGUtils.java index bd2490e726f..698db244e3e 100644 --- a/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGUtils.java +++ b/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGUtils.java @@ -14,7 +14,8 @@ import java.util.Collections; import java.util.List; import java.util.Properties; -import org.apache.maven.artifact.versioning.ComparableVersion; + +import datadog.trace.util.ComparableVersion; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.IClass; diff --git a/internal-api/build.gradle b/internal-api/build.gradle index 60b3581db97..1e8f8c37020 100644 --- a/internal-api/build.gradle +++ b/internal-api/build.gradle @@ -166,6 +166,7 @@ excludedClassesCoverage += [ "datadog.trace.util.ClassNameTrie.Builder", "datadog.trace.util.ClassNameTrie.JavaGenerator", "datadog.trace.util.CollectionUtils", + "datadog.trace.util.ComparableVersion", "datadog.trace.util.ConcurrentEnumMap", "datadog.trace.util.MethodHandles", "datadog.trace.util.PidHelper", diff --git a/internal-api/src/main/java/datadog/trace/util/ComparableVersion.java b/internal-api/src/main/java/datadog/trace/util/ComparableVersion.java new file mode 100644 index 00000000000..a0ba6b34236 --- /dev/null +++ b/internal-api/src/main/java/datadog/trace/util/ComparableVersion.java @@ -0,0 +1,518 @@ +package datadog.trace.util; + +import java.math.BigInteger; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Deque; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Properties; + +// backported from org.apache.maven:maven-artifact:3.9.9 +public class ComparableVersion implements Comparable { + private static final int MAX_INTITEM_LENGTH = 9; + private static final int MAX_LONGITEM_LENGTH = 18; + private String value; + private String canonical; + private ListItem items; + + public ComparableVersion(String version) { + this.parseVersion(version); + } + + public final void parseVersion(String version) { + this.value = version; + this.items = new ListItem(); + version = version.toLowerCase(Locale.ENGLISH); + ListItem list = this.items; + Deque stack = new ArrayDeque(); + stack.push(list); + boolean isDigit = false; + int startIndex = 0; + + for (int i = 0; i < version.length(); ++i) { + char c = version.charAt(i); + if (c == '.') { + if (i == startIndex) { + list.add(ComparableVersion.IntItem.ZERO); + } else { + list.add(parseItem(isDigit, version.substring(startIndex, i))); + } + + startIndex = i + 1; + } else if (c == '-') { + if (i == startIndex) { + list.add(ComparableVersion.IntItem.ZERO); + } else { + list.add(parseItem(isDigit, version.substring(startIndex, i))); + } + + startIndex = i + 1; + list.add(list = new ListItem()); + stack.push(list); + } else if (Character.isDigit(c)) { + if (!isDigit && i > startIndex) { + if (!list.isEmpty()) { + list.add(list = new ListItem()); + stack.push(list); + } + + list.add(new StringItem(version.substring(startIndex, i), true)); + startIndex = i; + list.add(list = new ListItem()); + stack.push(list); + } + + isDigit = true; + } else { + if (isDigit && i > startIndex) { + list.add(parseItem(true, version.substring(startIndex, i))); + startIndex = i; + list.add(list = new ListItem()); + stack.push(list); + } + + isDigit = false; + } + } + + if (version.length() > startIndex) { + if (!isDigit && !list.isEmpty()) { + list.add(list = new ListItem()); + stack.push(list); + } + + list.add(parseItem(isDigit, version.substring(startIndex))); + } + + while (!stack.isEmpty()) { + list = (ListItem) stack.pop(); + list.normalize(); + } + } + + private static Item parseItem(boolean isDigit, String buf) { + if (isDigit) { + buf = stripLeadingZeroes(buf); + if (buf.length() <= 9) { + return new IntItem(buf); + } else { + return buf.length() <= 18 ? new LongItem(buf) : new BigIntegerItem(buf); + } + } else { + return new StringItem(buf, false); + } + } + + private static String stripLeadingZeroes(String buf) { + if (buf != null && !buf.isEmpty()) { + for (int i = 0; i < buf.length(); ++i) { + char c = buf.charAt(i); + if (c != '0') { + return buf.substring(i); + } + } + + return buf; + } else { + return "0"; + } + } + + public int compareTo(ComparableVersion o) { + return this.items.compareTo(o.items); + } + + public String toString() { + return this.value; + } + + public String getCanonical() { + if (this.canonical == null) { + this.canonical = this.items.toString(); + } + + return this.canonical; + } + + public boolean equals(Object o) { + return o instanceof ComparableVersion && this.items.equals(((ComparableVersion) o).items); + } + + public int hashCode() { + return this.items.hashCode(); + } + + private static class IntItem implements Item { + private final int value; + public static final IntItem ZERO = new IntItem(); + + private IntItem() { + this.value = 0; + } + + IntItem(String str) { + this.value = Integer.parseInt(str); + } + + public int getType() { + return 3; + } + + public boolean isNull() { + return this.value == 0; + } + + public int compareTo(Item item) { + if (item == null) { + return this.value == 0 ? 0 : 1; + } else { + switch (item.getType()) { + case 0: + case 4: + return -1; + case 1: + return 1; + case 2: + return 1; + case 3: + int itemValue = ((IntItem) item).value; + return this.value < itemValue ? -1 : (this.value == itemValue ? 0 : 1); + default: + throw new IllegalStateException("invalid item: " + item.getClass()); + } + } + } + + public boolean equals(Object o) { + if (this == o) { + return true; + } else if (o != null && this.getClass() == o.getClass()) { + IntItem intItem = (IntItem) o; + return this.value == intItem.value; + } else { + return false; + } + } + + public int hashCode() { + return this.value; + } + + public String toString() { + return Integer.toString(this.value); + } + } + + private static class LongItem implements Item { + private final long value; + + LongItem(String str) { + this.value = Long.parseLong(str); + } + + public int getType() { + return 4; + } + + public boolean isNull() { + return this.value == 0L; + } + + public int compareTo(Item item) { + if (item == null) { + return this.value == 0L ? 0 : 1; + } else { + switch (item.getType()) { + case 0: + return -1; + case 1: + return 1; + case 2: + return 1; + case 3: + return 1; + case 4: + long itemValue = ((LongItem) item).value; + return this.value < itemValue ? -1 : (this.value == itemValue ? 0 : 1); + default: + throw new IllegalStateException("invalid item: " + item.getClass()); + } + } + } + + public boolean equals(Object o) { + if (this == o) { + return true; + } else if (o != null && this.getClass() == o.getClass()) { + LongItem longItem = (LongItem) o; + return this.value == longItem.value; + } else { + return false; + } + } + + public int hashCode() { + return (int) (this.value ^ this.value >>> 32); + } + + public String toString() { + return Long.toString(this.value); + } + } + + private static class BigIntegerItem implements Item { + private final BigInteger value; + + BigIntegerItem(String str) { + this.value = new BigInteger(str); + } + + public int getType() { + return 0; + } + + public boolean isNull() { + return BigInteger.ZERO.equals(this.value); + } + + public int compareTo(Item item) { + if (item == null) { + return BigInteger.ZERO.equals(this.value) ? 0 : 1; + } else { + switch (item.getType()) { + case 0: + return this.value.compareTo(((BigIntegerItem) item).value); + case 1: + return 1; + case 2: + return 1; + case 3: + case 4: + return 1; + default: + throw new IllegalStateException("invalid item: " + item.getClass()); + } + } + } + + public boolean equals(Object o) { + if (this == o) { + return true; + } else if (o != null && this.getClass() == o.getClass()) { + BigIntegerItem that = (BigIntegerItem) o; + return this.value.equals(that.value); + } else { + return false; + } + } + + public int hashCode() { + return this.value.hashCode(); + } + + public String toString() { + return this.value.toString(); + } + } + + private static class StringItem implements Item { + private static final List QUALIFIERS = + Arrays.asList("alpha", "beta", "milestone", "rc", "snapshot", "", "sp"); + private static final Properties ALIASES = new Properties(); + private static final String RELEASE_VERSION_INDEX; + private final String value; + + StringItem(String value, boolean followedByDigit) { + if (followedByDigit && value.length() == 1) { + switch (value.charAt(0)) { + case 'a': + value = "alpha"; + break; + case 'b': + value = "beta"; + break; + case 'm': + value = "milestone"; + } + } + + this.value = ALIASES.getProperty(value, value); + } + + public int getType() { + return 1; + } + + public boolean isNull() { + return comparableQualifier(this.value).compareTo(RELEASE_VERSION_INDEX) == 0; + } + + public static String comparableQualifier(String qualifier) { + int i = QUALIFIERS.indexOf(qualifier); + return i == -1 ? QUALIFIERS.size() + "-" + qualifier : String.valueOf(i); + } + + public int compareTo(Item item) { + if (item == null) { + return comparableQualifier(this.value).compareTo(RELEASE_VERSION_INDEX); + } else { + switch (item.getType()) { + case 0: + case 3: + case 4: + return -1; + case 1: + return comparableQualifier(this.value) + .compareTo(comparableQualifier(((StringItem) item).value)); + case 2: + return -1; + default: + throw new IllegalStateException("invalid item: " + item.getClass()); + } + } + } + + public boolean equals(Object o) { + if (this == o) { + return true; + } else if (o != null && this.getClass() == o.getClass()) { + StringItem that = (StringItem) o; + return this.value.equals(that.value); + } else { + return false; + } + } + + public int hashCode() { + return this.value.hashCode(); + } + + public String toString() { + return this.value; + } + + static { + ALIASES.put("ga", ""); + ALIASES.put("final", ""); + ALIASES.put("release", ""); + ALIASES.put("cr", "rc"); + RELEASE_VERSION_INDEX = String.valueOf(QUALIFIERS.indexOf("")); + } + } + + private static class ListItem extends ArrayList implements Item { + private ListItem() {} + + public int getType() { + return 2; + } + + public boolean isNull() { + return this.size() == 0; + } + + void normalize() { + for (int i = this.size() - 1; i >= 0; --i) { + Item lastItem = this.get(i); + if (lastItem.isNull()) { + this.remove(i); + } else if (!(lastItem instanceof ListItem)) { + break; + } + } + } + + public int compareTo(Item item) { + if (item == null) { + if (this.size() == 0) { + return 0; + } else { + for (Item i : this) { + int result = i.compareTo(null); + if (result != 0) { + return result; + } + } + + return 0; + } + } else { + switch (item.getType()) { + case 0: + case 3: + case 4: + return -1; + case 1: + return 1; + case 2: + Iterator left = this.iterator(); + Iterator right = ((ListItem) item).iterator(); + + while (left.hasNext() || right.hasNext()) { + Item l = left.hasNext() ? left.next() : null; + Item r = right.hasNext() ? right.next() : null; + int result = l == null ? (r == null ? 0 : -1 * r.compareTo(l)) : l.compareTo(r); + if (result != 0) { + return result; + } + } + + return 0; + default: + throw new IllegalStateException("invalid item: " + item.getClass()); + } + } + } + + public String toString() { + StringBuilder buffer = new StringBuilder(); + + for (Item item : this) { + if (buffer.length() > 0) { + buffer.append(item instanceof ListItem ? '-' : '.'); + } + + buffer.append(item); + } + + return buffer.toString(); + } + + private String toListString() { + StringBuilder buffer = new StringBuilder(); + buffer.append("["); + + for (Item item : this) { + if (buffer.length() > 1) { + buffer.append(", "); + } + + if (item instanceof ListItem) { + buffer.append(((ListItem) item).toListString()); + } else { + buffer.append(item); + } + } + + buffer.append("]"); + return buffer.toString(); + } + } + + private interface Item { + int INT_ITEM = 3; + int LONG_ITEM = 4; + int BIGINTEGER_ITEM = 0; + int STRING_ITEM = 1; + int LIST_ITEM = 2; + + int compareTo(Item var1); + + int getType(); + + boolean isNull(); + } +} From 8129852c4ebf1a73be1e4f5514194ad9601fc8cc Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Fri, 28 Feb 2025 17:14:56 +0100 Subject: [PATCH 21/41] update junit5 instrumentations --- .../src/test/groovy/CucumberTest.groovy | 28 ++++++++ .../src/test/groovy/JUnit58Test.groovy | 32 +++++++++ .../junit5/SpockTracingListener.java | 2 +- .../src/test/groovy/SpockTest.groovy | 30 +++++++++ .../junit5/JUnitPlatformUtils.java | 67 +++++++++++++++++++ .../junit5/TestEventsHandlerHolder.java | 5 +- .../junit5/TracingListener.java | 2 +- .../src/test/groovy/JUnit5Test.groovy | 32 +++++++++ 8 files changed, 195 insertions(+), 3 deletions(-) diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy index d28a995025d..ba9db268ce9 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy @@ -1,7 +1,12 @@ +import datadog.trace.agent.test.asserts.ListWriterAssert +import datadog.trace.api.DDSpanTypes +import datadog.trace.api.DDTags import datadog.trace.api.DisableTestTrace import datadog.trace.api.civisibility.config.TestFQN import datadog.trace.api.civisibility.config.TestIdentifier import datadog.trace.civisibility.CiVisibilityInstrumentationTest +import datadog.trace.civisibility.CiVisibilityTestUtils +import datadog.trace.civisibility.config.LibraryCapabilityUtils import datadog.trace.instrumentation.junit5.TestEventsHandlerHolder import io.cucumber.core.api.TypeRegistry import io.cucumber.core.options.Constants @@ -210,6 +215,29 @@ class CucumberTest extends CiVisibilityInstrumentationTest { ] } + def "test capabilities tagging #testcaseName"() { + def notPresentTags = new HashSet<>(LibraryCapabilityUtils.CAPABILITY_TAG_MAP.values()) + notPresentTags.removeAll(presentTags) + + runFeatures(["org/example/cucumber/calculator/basic_arithmetic.feature"], false, true) + + ListWriterAssert.assertTraces(TEST_WRITER, 4, true, new CiVisibilityTestUtils.SortTracesByType(), { + trace(1) { + span(0) { + spanType DDSpanTypes.TEST_SESSION_END + tags(false) { + arePresent(presentTags) + areNotPresent(notPresentTags) + } + } + } + }) + + where: + testcaseName | presentTags + "test-capabilities-base" | [DDTags.LIBRARY_CAPABILITIES_TIA, DDTags.LIBRARY_CAPABILITIES_ATR, DDTags.LIBRARY_CAPABILITIES_EFD, DDTags.LIBRARY_CAPABILITIES_QUARANTINE, DDTags.LIBRARY_CAPABILITIES_DISABLED, DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX] + } + private String parameterizedTestNameSuffix() { // older releases report different example names version() == "5.4.0" ? "Example #1" : "Example #1.1" diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy index 016442eb5b8..de327a5c39c 100644 --- a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy @@ -1,8 +1,15 @@ +import datadog.trace.agent.test.asserts.ListWriterAssert +import datadog.trace.api.DDSpanTypes +import datadog.trace.api.DDTags import datadog.trace.api.DisableTestTrace import datadog.trace.api.civisibility.CIConstants import datadog.trace.civisibility.CiVisibilityInstrumentationTest +import datadog.trace.civisibility.CiVisibilityTestUtils +import datadog.trace.civisibility.config.LibraryCapabilityUtils +import datadog.trace.instrumentation.junit5.JUnitPlatformUtils import datadog.trace.instrumentation.junit5.TestEventsHandlerHolder import org.example.* +import org.junit.jupiter.api.Assumptions import org.junit.jupiter.api.ClassOrderer import org.junit.jupiter.api.MethodOrderer import org.junit.jupiter.engine.Constants @@ -82,6 +89,31 @@ class JUnit58Test extends CiVisibilityInstrumentationTest { ] } + def "test capabilities tagging #testcaseName"() { + Assumptions.assumeTrue(assumption) + + def notPresentTags = new HashSet<>(LibraryCapabilityUtils.CAPABILITY_TAG_MAP.values()) + notPresentTags.removeAll(presentTags) + + runTests([TestSucceed], true) + + ListWriterAssert.assertTraces(TEST_WRITER, 5, true, new CiVisibilityTestUtils.SortTracesByType(), { + trace(1) { + span(0) { + spanType DDSpanTypes.TEST_SESSION_END + tags(false) { + arePresent(presentTags) + areNotPresent(notPresentTags) + } + } + } + }) + + where: + testcaseName | presentTags | assumption + "test-capabilities-ordering" | [DDTags.LIBRARY_CAPABILITIES_TIA, DDTags.LIBRARY_CAPABILITIES_ATR, DDTags.LIBRARY_CAPABILITIES_EFD, DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS, DDTags.LIBRARY_CAPABILITIES_QUARANTINE, DDTags.LIBRARY_CAPABILITIES_DISABLED, DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX, DDTags.LIBRARY_CAPABILITIES_FAIL_FAST_TEST_ORDER] | JUnitPlatformUtils.isJunitTestOrderingSupported(instrumentedLibraryVersion()) + } + private static void runTests(List> tests, boolean expectSuccess = true) { DiscoverySelector[] selectors = new DiscoverySelector[tests.size()] for (i in 0..(LibraryCapabilityUtils.CAPABILITY_TAG_MAP.values()) + notPresentTags.removeAll(presentTags) + + runTests([TestSucceedSpock], true) + + ListWriterAssert.assertTraces(TEST_WRITER, 4, true, new CiVisibilityTestUtils.SortTracesByType(), { + trace(1) { + span(0) { + spanType DDSpanTypes.TEST_SESSION_END + tags(false) { + arePresent(presentTags) + areNotPresent(notPresentTags) + } + } + } + }) + + where: + testcaseName | presentTags + "test-capabilities-base" | [DDTags.LIBRARY_CAPABILITIES_TIA, DDTags.LIBRARY_CAPABILITIES_ATR, DDTags.LIBRARY_CAPABILITIES_EFD, DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS, DDTags.LIBRARY_CAPABILITIES_QUARANTINE, DDTags.LIBRARY_CAPABILITIES_DISABLED, DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX] + } + private static void runTests(List> classes, boolean expectSuccess = true) { DiscoverySelector[] selectors = new DiscoverySelector[classes.size()] for (i in 0.. junitCapabilities(String version) { + List baseCapabilities = + new ArrayList<>( + Arrays.asList( + LibraryCapability.TIA, + LibraryCapability.ATR, + LibraryCapability.EFD, + LibraryCapability.IMPACTED, + LibraryCapability.QUARANTINE, + LibraryCapability.DISABLED, + LibraryCapability.ATTEMPT_TO_FIX)); + + if (isJunitTestOrderingSupported(version)) { + baseCapabilities.add(LibraryCapability.FAIL_FAST); + } + + return baseCapabilities; + } + + private static List spockCapabilities() { + return Arrays.asList( + LibraryCapability.TIA, + LibraryCapability.ATR, + LibraryCapability.EFD, + LibraryCapability.IMPACTED, + LibraryCapability.QUARANTINE, + LibraryCapability.DISABLED, + LibraryCapability.ATTEMPT_TO_FIX); + } + + private static List cucumberCapabilities() { + return Arrays.asList( + LibraryCapability.TIA, + LibraryCapability.ATR, + LibraryCapability.EFD, + LibraryCapability.QUARANTINE, + LibraryCapability.DISABLED, + LibraryCapability.ATTEMPT_TO_FIX); + } + + public static List availableCapabilities(TestEngine testEngine) { + TestFrameworkInstrumentation framework = engineToFramework(testEngine); + if (framework.equals(TestFrameworkInstrumentation.CUCUMBER)) { + return cucumberCapabilities(); + } else if (framework.equals(TestFrameworkInstrumentation.SPOCK)) { + return spockCapabilities(); + } else { + return junitCapabilities(getFrameworkVersion(testEngine)); + } + } } diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java index cfffdcb708c..9fd4154d4ef 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java +++ b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java @@ -63,7 +63,10 @@ public static synchronized void start( if (handler == null) { handler = InstrumentationBridge.createTestEventsHandler( - framework.name().toLowerCase(), suiteStore, testStore); + framework.name().toLowerCase(), + suiteStore, + testStore, + JUnitPlatformUtils.availableCapabilities(testEngine)); HANDLERS.put(framework, handler); } } diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TracingListener.java b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TracingListener.java index 24f794b83dd..279c4a153f9 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TracingListener.java +++ b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TracingListener.java @@ -23,7 +23,7 @@ public class TracingListener implements EngineExecutionListener { public TracingListener(TestEngine testEngine) { String engineId = testEngine.getId(); testFramework = engineId == null || engineId.startsWith("junit") ? "junit5" : engineId; - testFrameworkVersion = testEngine.getVersion().orElse(null); + testFrameworkVersion = JUnitPlatformUtils.getFrameworkVersion(testEngine); } @Override diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy b/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy index 655cf3b2367..a8c39898129 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy @@ -1,9 +1,15 @@ +import datadog.trace.agent.test.asserts.ListWriterAssert +import datadog.trace.api.DDSpanTypes +import datadog.trace.api.DDTags import datadog.trace.api.DisableTestTrace import datadog.trace.api.civisibility.config.TestFQN import datadog.trace.api.civisibility.config.TestIdentifier import datadog.trace.civisibility.CiVisibilityInstrumentationTest +import datadog.trace.civisibility.CiVisibilityTestUtils +import datadog.trace.civisibility.config.LibraryCapabilityUtils import datadog.trace.civisibility.diff.FileDiff import datadog.trace.civisibility.diff.LineDiff +import datadog.trace.instrumentation.junit5.JUnitPlatformUtils import datadog.trace.instrumentation.junit5.TestEventsHandlerHolder import org.example.TestAssumption import org.example.TestAssumptionAndSucceed @@ -35,6 +41,7 @@ import org.example.TestSucceedVerySlow import org.example.TestSucceedWithCategories import org.example.TestSuiteSetUpAssumption import org.example.TestTemplate +import org.junit.jupiter.api.Assumptions import org.junit.jupiter.engine.JupiterTestEngine import org.junit.platform.engine.DiscoverySelector import org.junit.platform.engine.TestExecutionResult @@ -243,6 +250,31 @@ class JUnit5Test extends CiVisibilityInstrumentationTest { "test-attempt-to-fix-disabled-succeeded" | true | [TestSucceed] | [new TestFQN("org.example.TestSucceed", "test_succeed")] | [] | [new TestFQN("org.example.TestSucceed", "test_succeed")] } + def "test capabilities tagging #testcaseName"() { + Assumptions.assumeTrue(assumption) + + def notPresentTags = new HashSet<>(LibraryCapabilityUtils.CAPABILITY_TAG_MAP.values()) + notPresentTags.removeAll(presentTags) + + runTests([TestSucceed], true) + + ListWriterAssert.assertTraces(TEST_WRITER, 4, true, new CiVisibilityTestUtils.SortTracesByType(), { + trace(1) { + span(0) { + spanType DDSpanTypes.TEST_SESSION_END + tags(false) { + arePresent(presentTags) + areNotPresent(notPresentTags) + } + } + } + }) + + where: + testcaseName | presentTags | assumption + "test-capabilities-base" | [DDTags.LIBRARY_CAPABILITIES_TIA, DDTags.LIBRARY_CAPABILITIES_ATR, DDTags.LIBRARY_CAPABILITIES_EFD, DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS, DDTags.LIBRARY_CAPABILITIES_QUARANTINE, DDTags.LIBRARY_CAPABILITIES_DISABLED, DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX] | !JUnitPlatformUtils.isJunitTestOrderingSupported(instrumentedLibraryVersion()) + } + protected void runTests(List> tests, boolean expectSuccess = true) { DiscoverySelector[] selectors = new DiscoverySelector[tests.size()] for (i in 0.. Date: Fri, 28 Feb 2025 17:25:11 +0100 Subject: [PATCH 22/41] update junit4 instrumentations --- .../src/test/groovy/CucumberTest.groovy | 29 +++++++++++++ .../src/test/groovy/MUnitTest.groovy | 28 ++++++++++++ .../instrumentation/junit4/JUnit4Utils.java | 43 +++++++++++++++++++ .../junit4/TestEventsHandlerHolder.java | 5 ++- .../src/test/groovy/JUnit4Test.groovy | 28 ++++++++++++ 5 files changed, 132 insertions(+), 1 deletion(-) diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy index 1d16617beaf..847b42634fe 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy @@ -1,12 +1,18 @@ +import datadog.trace.agent.test.asserts.ListWriterAssert +import datadog.trace.api.DDSpanTypes +import datadog.trace.api.DDTags import datadog.trace.api.DisableTestTrace import datadog.trace.api.civisibility.config.TestFQN import datadog.trace.api.civisibility.config.TestIdentifier import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation import datadog.trace.civisibility.CiVisibilityInstrumentationTest +import datadog.trace.civisibility.CiVisibilityTestUtils +import datadog.trace.civisibility.config.LibraryCapabilityUtils import datadog.trace.instrumentation.junit4.CucumberTracingListener import datadog.trace.instrumentation.junit4.TestEventsHandlerHolder import io.cucumber.core.options.Constants import org.example.cucumber.TestSucceedCucumber +import org.junit.jupiter.api.Assumptions import org.junit.runner.JUnitCore import java.util.stream.Collectors @@ -201,6 +207,29 @@ class CucumberTest extends CiVisibilityInstrumentationTest { ] } + def "test capabilities tagging #testcaseName"() { + def notPresentTags = new HashSet<>(LibraryCapabilityUtils.CAPABILITY_TAG_MAP.values()) + notPresentTags.removeAll(presentTags) + + runFeatures(["org/example/cucumber/calculator/basic_arithmetic.feature"], true) + + ListWriterAssert.assertTraces(TEST_WRITER, 4, true, new CiVisibilityTestUtils.SortTracesByType(), { + trace(1) { + span(0) { + spanType DDSpanTypes.TEST_SESSION_END + tags(false) { + arePresent(presentTags) + areNotPresent(notPresentTags) + } + } + } + }) + + where: + testcaseName | presentTags + "test-capabilities-base" | [DDTags.LIBRARY_CAPABILITIES_TIA, DDTags.LIBRARY_CAPABILITIES_ATR, DDTags.LIBRARY_CAPABILITIES_EFD, DDTags.LIBRARY_CAPABILITIES_QUARANTINE, DDTags.LIBRARY_CAPABILITIES_DISABLED, DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX] + } + private String version() { return CucumberTracingListener.FRAMEWORK_VERSION < "7" ? CucumberTracingListener.FRAMEWORK_VERSION : "latest" } diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy index 19eb74ae243..a6f3b1c0937 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy @@ -1,7 +1,12 @@ +import datadog.trace.agent.test.asserts.ListWriterAssert +import datadog.trace.api.DDSpanTypes +import datadog.trace.api.DDTags import datadog.trace.api.DisableTestTrace import datadog.trace.api.civisibility.config.TestFQN import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation import datadog.trace.civisibility.CiVisibilityInstrumentationTest +import datadog.trace.civisibility.CiVisibilityTestUtils +import datadog.trace.civisibility.config.LibraryCapabilityUtils import datadog.trace.civisibility.diff.FileDiff import datadog.trace.civisibility.diff.LineDiff import datadog.trace.instrumentation.junit4.MUnitTracingListener @@ -144,6 +149,29 @@ class MUnitTest extends CiVisibilityInstrumentationTest { "test-attempt-to-fix-disabled-succeeded" | true | [TestSucceedMUnit] | [new TestFQN("org.example.TestSucceedMUnit", "Calculator.add")] | [] | [new TestFQN("org.example.TestSucceedMUnit", "Calculator.add")] } + def "test capabilities tagging #testcaseName"() { + def notPresentTags = new HashSet<>(LibraryCapabilityUtils.CAPABILITY_TAG_MAP.values()) + notPresentTags.removeAll(presentTags) + + runTests([TestSucceedMUnit], true) + + ListWriterAssert.assertTraces(TEST_WRITER, 4, true, new CiVisibilityTestUtils.SortTracesByType(), { + trace(1) { + span(0) { + spanType DDSpanTypes.TEST_SESSION_END + tags(false) { + arePresent(presentTags) + areNotPresent(notPresentTags) + } + } + } + }) + + where: + testcaseName | presentTags + "test-capabilities-base" | [DDTags.LIBRARY_CAPABILITIES_ATR, DDTags.LIBRARY_CAPABILITIES_EFD, DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS, DDTags.LIBRARY_CAPABILITIES_QUARANTINE, DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX] + } + private void runTests(Collection> tests, boolean expectSuccess = true) { TestEventsHandlerHolder.start(TestFrameworkInstrumentation.MUNIT) try { diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Utils.java b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Utils.java index b8a88a464db..72e7ab9efe8 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Utils.java +++ b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Utils.java @@ -2,16 +2,19 @@ import static datadog.json.JsonMapper.toJson; +import datadog.trace.api.civisibility.config.LibraryCapability; import datadog.trace.api.civisibility.config.TestIdentifier; import datadog.trace.api.civisibility.config.TestSourceData; import datadog.trace.api.civisibility.events.TestDescriptor; import datadog.trace.api.civisibility.events.TestSuiteDescriptor; import datadog.trace.api.civisibility.telemetry.tag.SkipReason; +import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation; import datadog.trace.util.MethodHandles; import java.lang.annotation.Annotation; import java.lang.invoke.MethodHandle; import java.lang.reflect.Method; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.regex.Matcher; @@ -330,4 +333,44 @@ public static boolean isJUnitPlatformRunnerTest(Description description) { Object uniqueId = getUniqueId(description); return uniqueId != null && uniqueId.toString().contains("[engine:"); } + private static List cucumberCapabilities() { + return Arrays.asList( + LibraryCapability.TIA, + LibraryCapability.ATR, + LibraryCapability.EFD, + LibraryCapability.QUARANTINE, + LibraryCapability.DISABLED, + LibraryCapability.ATTEMPT_TO_FIX); + } + + private static List munitCapabilities() { + return Arrays.asList( + LibraryCapability.ATR, + LibraryCapability.EFD, + LibraryCapability.IMPACTED, + LibraryCapability.QUARANTINE, + LibraryCapability.ATTEMPT_TO_FIX); + } + + private static List junitCapabilities() { + return Arrays.asList( + LibraryCapability.TIA, + LibraryCapability.ATR, + LibraryCapability.EFD, + LibraryCapability.IMPACTED, + LibraryCapability.QUARANTINE, + LibraryCapability.DISABLED, + LibraryCapability.ATTEMPT_TO_FIX); + } + + public static List availableCapabilities( + TestFrameworkInstrumentation framework) { + if (framework.equals(TestFrameworkInstrumentation.MUNIT)) { + return munitCapabilities(); + } else if (framework.equals(TestFrameworkInstrumentation.CUCUMBER)) { + return cucumberCapabilities(); + } else { + return junitCapabilities(); + } + } } diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TestEventsHandlerHolder.java b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TestEventsHandlerHolder.java index db5b9de2b3c..bf80e9296bd 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TestEventsHandlerHolder.java +++ b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TestEventsHandlerHolder.java @@ -31,7 +31,10 @@ public static synchronized void start(TestFrameworkInstrumentation framework) { HANDLERS.put( framework, InstrumentationBridge.createTestEventsHandler( - framework.name().toLowerCase(), null, null)); + framework.name().toLowerCase(), + null, + null, + JUnit4Utils.availableCapabilities(framework))); } } diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy b/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy index 95b107ac860..e3eb8016288 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy @@ -1,8 +1,13 @@ +import datadog.trace.agent.test.asserts.ListWriterAssert +import datadog.trace.api.DDSpanTypes +import datadog.trace.api.DDTags import datadog.trace.api.DisableTestTrace import datadog.trace.api.civisibility.config.TestFQN import datadog.trace.api.civisibility.config.TestIdentifier import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation import datadog.trace.civisibility.CiVisibilityInstrumentationTest +import datadog.trace.civisibility.CiVisibilityTestUtils +import datadog.trace.civisibility.config.LibraryCapabilityUtils import datadog.trace.civisibility.diff.FileDiff import datadog.trace.civisibility.diff.LineDiff import datadog.trace.instrumentation.junit4.TestEventsHandlerHolder @@ -206,6 +211,29 @@ class JUnit4Test extends CiVisibilityInstrumentationTest { "test-attempt-to-fix-disabled-succeeded" | true | [TestSucceed] | [new TestFQN("org.example.TestSucceed", "test_succeed")] | [] | [new TestFQN("org.example.TestSucceed", "test_succeed")] } + def "test capabilities tagging #testcaseName"() { + def notPresentTags = new HashSet<>(LibraryCapabilityUtils.CAPABILITY_TAG_MAP.values()) + notPresentTags.removeAll(presentTags) + + runTests([TestSucceed], true) + + ListWriterAssert.assertTraces(TEST_WRITER, 4, true, new CiVisibilityTestUtils.SortTracesByType(), { + trace(1) { + span(0) { + spanType DDSpanTypes.TEST_SESSION_END + tags(false) { + arePresent(presentTags) + areNotPresent(notPresentTags) + } + } + } + }) + + where: + testcaseName | presentTags + "test-capabilities-base" | [DDTags.LIBRARY_CAPABILITIES_TIA, DDTags.LIBRARY_CAPABILITIES_ATR, DDTags.LIBRARY_CAPABILITIES_EFD, DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS, DDTags.LIBRARY_CAPABILITIES_QUARANTINE, DDTags.LIBRARY_CAPABILITIES_DISABLED, DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX] + } + private void runTests(Collection> tests, boolean expectSuccess = true) { TestEventsHandlerHolder.start(TestFrameworkInstrumentation.JUNIT4) try { From 6685a5b8458c590f6818cc0a7a8c3adb765fbbc6 Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Fri, 28 Feb 2025 17:29:02 +0100 Subject: [PATCH 23/41] extend headless test session to ensure all capabilities are propagated --- .../domain/headless/HeadlessTestSessionTest.groovy | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/headless/HeadlessTestSessionTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/headless/HeadlessTestSessionTest.groovy index 84c1e0ea5b3..d06f23eb94f 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/headless/HeadlessTestSessionTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/headless/HeadlessTestSessionTest.groovy @@ -12,6 +12,7 @@ import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation import datadog.trace.bootstrap.instrumentation.api.Tags import datadog.trace.civisibility.codeowners.Codeowners import datadog.trace.civisibility.config.ExecutionSettings +import datadog.trace.civisibility.config.LibraryCapabilityUtils import datadog.trace.civisibility.config.TestManagementSettings import datadog.trace.civisibility.decorator.TestDecorator import datadog.trace.civisibility.domain.SpanWriterTest @@ -43,8 +44,12 @@ class HeadlessTestSessionTest extends SpanWriterTest { "$Tags.TEST_TEST_MANAGEMENT_ENABLED" true "$DDTags.LIBRARY_CAPABILITIES_TIA" false "$DDTags.LIBRARY_CAPABILITIES_EFD" false + "$DDTags.LIBRARY_CAPABILITIES_ATR" false + "$DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS" false + "$DDTags.LIBRARY_CAPABILITIES_FAIL_FAST_TEST_ORDER" false "$DDTags.LIBRARY_CAPABILITIES_QUARANTINE" true - isNotPresent("$DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX") + "$DDTags.LIBRARY_CAPABILITIES_DISABLED" true + "$DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX" true } } span(1) { @@ -70,7 +75,7 @@ class HeadlessTestSessionTest extends SpanWriterTest { def executionStrategy = new ExecutionStrategy(Stub(Config), executionSettings, Stub(SourcePathResolver), Stub(LinesResolver)) - def availableCapabilities = [LibraryCapability.TIA, LibraryCapability.EFD, LibraryCapability.QUARANTINE] + def availableCapabilities = Arrays.asList(LibraryCapability.values()) new HeadlessTestSession( "project-name", From 79df146c4f08e9387d0537e5119cf41b7bc3a5ce Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Fri, 28 Feb 2025 17:34:36 +0100 Subject: [PATCH 24/41] update scalatest instrumentation --- .../CiVisibilityInstrumentationTest.groovy | 18 ++++++------ .../civisibility/CiVisibilitySmokeTest.groovy | 4 +-- .../instrumentation/scalatest/RunContext.java | 16 +++++++++- .../src/test/groovy/ScalatestTest.groovy | 29 +++++++++++++++++++ 4 files changed, 55 insertions(+), 12 deletions(-) diff --git a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy index 411062fadfd..09941d6f539 100644 --- a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy @@ -357,15 +357,15 @@ abstract class CiVisibilityInstrumentationTest extends AgentTestRunner { ] + replacements // uncomment to generate expected data templates - // def clazz = this.getClass() - // def resourceName = "/" + clazz.name.replace('.', '/') + ".class" - // def classfilePath = clazz.getResource(resourceName).toURI().schemeSpecificPart - // def searchIndex = classfilePath.indexOf("/build/classes/groovy") - // def modulePath = classfilePath.substring(0, searchIndex) - // def submoduleName = classfilePath.substring(searchIndex + "/build/classes/groovy".length()).split("/")[1] - // def baseTemplatesPath = modulePath + "/src/" + submoduleName + "/resources/" + testcaseName - // CiVisibilityTestUtils.generateTemplates(baseTemplatesPath, events, coverages, additionalReplacements) - // return [:] + def clazz = this.getClass() + def resourceName = "/" + clazz.name.replace('.', '/') + ".class" + def classfilePath = clazz.getResource(resourceName).toURI().schemeSpecificPart + def searchIndex = classfilePath.indexOf("/build/classes/groovy") + def modulePath = classfilePath.substring(0, searchIndex) + def submoduleName = classfilePath.substring(searchIndex + "/build/classes/groovy".length()).split("/")[1] + def baseTemplatesPath = modulePath + "/src/" + submoduleName + "/resources/" + testcaseName + CiVisibilityTestUtils.generateTemplates(baseTemplatesPath, events, coverages, additionalReplacements) + return [:] return CiVisibilityTestUtils.assertData(testcaseName, events, coverages, additionalReplacements) } diff --git a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilitySmokeTest.groovy b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilitySmokeTest.groovy index 645cc1965d9..90522702a4f 100644 --- a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilitySmokeTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilitySmokeTest.groovy @@ -9,8 +9,8 @@ abstract class CiVisibilitySmokeTest extends Specification { def additionalReplacements = ["content.meta.['test.toolchain']": "$toolchain:$toolchainVersion"] // uncomment to generate expected data templates - // def baseTemplatesPath = CiVisibilitySmokeTest.classLoader.getResource(projectName).toURI().schemeSpecificPart.replace('build/resources/test', 'src/test/resources') - // CiVisibilityTestUtils.generateTemplates(baseTemplatesPath, events, coverages, additionalReplacements) + def baseTemplatesPath = CiVisibilitySmokeTest.classLoader.getResource(projectName).toURI().schemeSpecificPart.replace('build/resources/test', 'src/test/resources') + CiVisibilityTestUtils.generateTemplates(baseTemplatesPath, events, coverages, additionalReplacements) CiVisibilityTestUtils.assertData(projectName, events, coverages, additionalReplacements) } diff --git a/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/RunContext.java b/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/RunContext.java index 9d67dc38699..0c668809926 100644 --- a/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/RunContext.java +++ b/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/RunContext.java @@ -1,6 +1,7 @@ package datadog.trace.instrumentation.scalatest; import datadog.trace.api.civisibility.InstrumentationBridge; +import datadog.trace.api.civisibility.config.LibraryCapability; import datadog.trace.api.civisibility.config.TestIdentifier; import datadog.trace.api.civisibility.config.TestSourceData; import datadog.trace.api.civisibility.events.TestDescriptor; @@ -10,6 +11,8 @@ import datadog.trace.api.civisibility.execution.TestExecutionPolicy; import datadog.trace.api.civisibility.telemetry.tag.SkipReason; import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import javax.annotation.Nullable; @@ -34,8 +37,19 @@ public static void destroy(int runStamp) { } private final int runStamp; + + private final List availableCapabilities = + Arrays.asList( + LibraryCapability.TIA, + LibraryCapability.EFD, + LibraryCapability.ATR, + LibraryCapability.IMPACTED, + LibraryCapability.QUARANTINE, + LibraryCapability.DISABLED, + LibraryCapability.ATTEMPT_TO_FIX); private final TestEventsHandler eventHandler = - InstrumentationBridge.createTestEventsHandler("scalatest", null, null); + InstrumentationBridge.createTestEventsHandler("scalatest", null, null, availableCapabilities); + private final java.util.Map skipReasonByTest = new ConcurrentHashMap<>(); private final java.util.Set itrUnskippableTests = ConcurrentHashMap.newKeySet(); diff --git a/dd-java-agent/instrumentation/scalatest/src/test/groovy/ScalatestTest.groovy b/dd-java-agent/instrumentation/scalatest/src/test/groovy/ScalatestTest.groovy index f0a48169d77..be6f723fecf 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/groovy/ScalatestTest.groovy +++ b/dd-java-agent/instrumentation/scalatest/src/test/groovy/ScalatestTest.groovy @@ -1,6 +1,11 @@ +import datadog.trace.agent.test.asserts.ListWriterAssert +import datadog.trace.api.DDSpanTypes +import datadog.trace.api.DDTags import datadog.trace.api.civisibility.config.TestFQN import datadog.trace.api.civisibility.config.TestIdentifier import datadog.trace.civisibility.CiVisibilityInstrumentationTest +import datadog.trace.civisibility.CiVisibilityTestUtils +import datadog.trace.civisibility.config.LibraryCapabilityUtils import datadog.trace.civisibility.diff.FileDiff import datadog.trace.civisibility.diff.LineDiff import datadog.trace.instrumentation.scalatest.ScalatestUtils @@ -17,6 +22,7 @@ import org.example.TestSucceedMoreCases import org.example.TestSucceedParameterized import org.example.TestSucceedSlow import org.example.TestSucceedUnskippable +import org.junit.jupiter.api.Assumptions import org.scalatest.tools.Runner class ScalatestTest extends CiVisibilityInstrumentationTest { @@ -178,6 +184,29 @@ class ScalatestTest extends CiVisibilityInstrumentationTest { "test-attempt-to-fix-disabled-succeeded" | true | [TestSucceed] | [new TestFQN("org.example.TestSucceed", "Example.add adds two numbers")] | [] | [new TestFQN("org.example.TestSucceed", "Example.add adds two numbers")] } + def "test capabilities tagging #testcaseName"() { + def notPresentTags = new HashSet<>(LibraryCapabilityUtils.CAPABILITY_TAG_MAP.values()) + notPresentTags.removeAll(presentTags) + + runTests([TestSucceed], true) + + ListWriterAssert.assertTraces(TEST_WRITER, 4, true, new CiVisibilityTestUtils.SortTracesByType(), { + trace(1) { + span(0) { + spanType DDSpanTypes.TEST_SESSION_END + tags(false) { + arePresent(presentTags) + areNotPresent(notPresentTags) + } + } + } + }) + + where: + testcaseName | presentTags + "test-capabilities-base" | [DDTags.LIBRARY_CAPABILITIES_TIA, DDTags.LIBRARY_CAPABILITIES_ATR, DDTags.LIBRARY_CAPABILITIES_EFD, DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS, DDTags.LIBRARY_CAPABILITIES_QUARANTINE, DDTags.LIBRARY_CAPABILITIES_DISABLED, DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX] + } + @Override String instrumentedLibraryName() { return "scalatest" From 063b82a4dc891385be3c9536a0ded55b790d44b1 Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Tue, 4 Mar 2025 12:53:10 +0100 Subject: [PATCH 25/41] tag ignoring in span assertion and update smoke test fixtures --- .../headless/HeadlessTestSessionTest.groovy | 1 - .../CiVisibilityInstrumentationTest.groovy | 26 ++++--- .../civisibility/CiVisibilitySmokeTest.groovy | 6 +- .../civisibility/CiVisibilityTestUtils.groovy | 73 ++++++++++++++++++- .../src/test/groovy/CucumberTest.groovy | 9 ++- .../src/test/groovy/MUnitTest.groovy | 8 +- .../instrumentation/junit4/JUnit4Utils.java | 1 + .../src/test/groovy/JUnit4Test.groovy | 10 ++- .../src/test/groovy/CucumberTest.groovy | 9 ++- .../src/test/groovy/JUnit58Test.groovy | 11 ++- .../src/test/groovy/SpockTest.groovy | 10 ++- .../src/test/groovy/JUnit5Test.groovy | 10 ++- .../src/test/groovy/ScalatestTest.groovy | 11 ++- .../instrumentation/testng/TestNGUtils.java | 3 +- .../test-failed-flaky-retries/events.ftl | 42 +++++++++++ .../events.ftl | 14 ++++ .../events.ftl | 14 ++++ .../events.ftl | 24 +++++- .../resources/test-succeed-junit-5/events.ftl | 24 ++++++ .../events.ftl | 21 ++++++ .../coverages.ftl | 22 +++--- .../events.ftl | 30 ++++++++ .../coverages.ftl | 22 +++--- .../events.ftl | 30 ++++++++ .../events.ftl | 28 +++++++ .../events.ftl | 28 +++++++ .../events.ftl | 21 ++++++ .../test-succeed-old-gradle/events.ftl | 21 ++++++ .../events.ftl | 42 +++++++++++ .../test_successful_maven_run/events.ftl | 21 ++++++ .../events.ftl | 21 ++++++ .../events.ftl | 21 ++++++ .../events.ftl | 14 ++++ .../events.ftl | 24 ++++++ .../events.ftl | 21 ++++++ .../events.ftl | 21 ++++++ .../events.ftl | 63 ++++++++++++++++ .../events.ftl | 14 ++++ .../events.ftl | 12 +++ .../events.ftl | 21 ++++++ 40 files changed, 769 insertions(+), 55 deletions(-) diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/headless/HeadlessTestSessionTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/headless/HeadlessTestSessionTest.groovy index d06f23eb94f..9503481bf42 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/headless/HeadlessTestSessionTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/headless/HeadlessTestSessionTest.groovy @@ -12,7 +12,6 @@ import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation import datadog.trace.bootstrap.instrumentation.api.Tags import datadog.trace.civisibility.codeowners.Codeowners import datadog.trace.civisibility.config.ExecutionSettings -import datadog.trace.civisibility.config.LibraryCapabilityUtils import datadog.trace.civisibility.config.TestManagementSettings import datadog.trace.civisibility.decorator.TestDecorator import datadog.trace.civisibility.domain.SpanWriterTest diff --git a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy index 09941d6f539..22bd30da0c7 100644 --- a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy @@ -343,7 +343,7 @@ abstract class CiVisibilityInstrumentationTest extends AgentTestRunner { settings.impactedTestsDetectionEnabled = impactedTestsDetectionEnabled } - def assertSpansData(String testcaseName, Map replacements = [:]) { + def assertSpansData(String testcaseName, Map replacements = [:], List ignoredTags = []) { Predicate sessionSpan = span -> span.spanType == "test_session_end" spanFilter.waitForSpan(sessionSpan, TimeUnit.SECONDS.toMillis(20)) @@ -356,18 +356,20 @@ abstract class CiVisibilityInstrumentationTest extends AgentTestRunner { "content.meta.['test.toolchain']" : "${instrumentedLibraryName()}:${instrumentedLibraryVersion()}" ] + replacements + def additionalIgnoredTags = CiVisibilityTestUtils.IGNORED_TAGS + ignoredTags + // uncomment to generate expected data templates - def clazz = this.getClass() - def resourceName = "/" + clazz.name.replace('.', '/') + ".class" - def classfilePath = clazz.getResource(resourceName).toURI().schemeSpecificPart - def searchIndex = classfilePath.indexOf("/build/classes/groovy") - def modulePath = classfilePath.substring(0, searchIndex) - def submoduleName = classfilePath.substring(searchIndex + "/build/classes/groovy".length()).split("/")[1] - def baseTemplatesPath = modulePath + "/src/" + submoduleName + "/resources/" + testcaseName - CiVisibilityTestUtils.generateTemplates(baseTemplatesPath, events, coverages, additionalReplacements) - return [:] - - return CiVisibilityTestUtils.assertData(testcaseName, events, coverages, additionalReplacements) + // def clazz = this.getClass() + // def resourceName = "/" + clazz.name.replace('.', '/') + ".class" + // def classfilePath = clazz.getResource(resourceName).toURI().schemeSpecificPart + // def searchIndex = classfilePath.indexOf("/build/classes/groovy") + // def modulePath = classfilePath.substring(0, searchIndex) + // def submoduleName = classfilePath.substring(searchIndex + "/build/classes/groovy".length()).split("/")[1] + // def baseTemplatesPath = modulePath + "/src/" + submoduleName + "/resources/" + testcaseName + // CiVisibilityTestUtils.generateTemplates(baseTemplatesPath, events, coverages, additionalReplacements, CiVisibilityTestUtils.IGNORED_TAGS) + // return [:] + + return CiVisibilityTestUtils.assertData(testcaseName, events, coverages, additionalReplacements, additionalIgnoredTags) } def assertTestsOrder(List expectedOrder) { diff --git a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilitySmokeTest.groovy b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilitySmokeTest.groovy index 90522702a4f..9f084ab9c42 100644 --- a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilitySmokeTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilitySmokeTest.groovy @@ -9,10 +9,10 @@ abstract class CiVisibilitySmokeTest extends Specification { def additionalReplacements = ["content.meta.['test.toolchain']": "$toolchain:$toolchainVersion"] // uncomment to generate expected data templates - def baseTemplatesPath = CiVisibilitySmokeTest.classLoader.getResource(projectName).toURI().schemeSpecificPart.replace('build/resources/test', 'src/test/resources') - CiVisibilityTestUtils.generateTemplates(baseTemplatesPath, events, coverages, additionalReplacements) + // def baseTemplatesPath = CiVisibilitySmokeTest.classLoader.getResource(projectName).toURI().schemeSpecificPart.replace('build/resources/test', 'src/test/resources') + // CiVisibilityTestUtils.generateTemplates(baseTemplatesPath, events, coverages, additionalReplacements) - CiVisibilityTestUtils.assertData(projectName, events, coverages, additionalReplacements) + CiVisibilityTestUtils.assertData(projectName, events, coverages, additionalReplacements, []) } /** diff --git a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityTestUtils.groovy b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityTestUtils.groovy index 9c7ddac0ebf..a9873088888 100644 --- a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityTestUtils.groovy +++ b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityTestUtils.groovy @@ -10,6 +10,7 @@ import com.jayway.jsonpath.WriteContext import datadog.trace.agent.test.asserts.ListWriterAssert import datadog.trace.api.Config import datadog.trace.api.DDSpanTypes +import datadog.trace.api.DDTags import datadog.trace.civisibility.ci.CIProviderInfoFactory import datadog.trace.civisibility.ci.GitLabInfo import datadog.trace.civisibility.ci.GithubActionsInfo @@ -61,6 +62,18 @@ abstract class CiVisibilityTestUtils { path("content.meta.['error.stack']", false), ] + // ignored tags on assertion and fixture build + static final List IGNORED_TAGS = [ + "content.meta.[$DDTags.LIBRARY_CAPABILITIES_TIA]", + "content.meta.[$DDTags.LIBRARY_CAPABILITIES_EFD]", + "content.meta.[$DDTags.LIBRARY_CAPABILITIES_ATR]", + "content.meta.[$DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS]", + "content.meta.[$DDTags.LIBRARY_CAPABILITIES_FAIL_FAST_TEST_ORDER]", + "content.meta.[$DDTags.LIBRARY_CAPABILITIES_QUARANTINE]", + "content.meta.[$DDTags.LIBRARY_CAPABILITIES_DISABLED]", + "content.meta.[$DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX]", + ] + static final List COVERAGE_DYNAMIC_PATHS = [path("test_session_id"), path("test_suite_id"), path("span_id"),] private static final Comparator> EVENT_RESOURCE_COMPARATOR = Comparator., String> comparing((Map m) -> { @@ -74,7 +87,10 @@ abstract class CiVisibilityTestUtils { /** * Use this method to generate expected data templates */ - static void generateTemplates(String baseTemplatesPath, List> events, List> coverages, Map additionalReplacements) { + static void generateTemplates(String baseTemplatesPath, List> events, List> coverages, Map additionalReplacements, List ignoredTags = []) { + if (!ignoredTags.empty) { + removeTags(events, ignoredTags) + } events.sort(EVENT_RESOURCE_COMPARATOR) def templateGenerator = new TemplateGenerator(new LabelGenerator()) @@ -85,7 +101,7 @@ abstract class CiVisibilityTestUtils { Files.write(Paths.get(baseTemplatesPath, "coverages.ftl"), templateGenerator.generateTemplate(coverages, COVERAGE_DYNAMIC_PATHS + compiledAdditionalReplacements).bytes) } - static Map assertData(String baseTemplatesPath, List> events, List> coverages, Map additionalReplacements) { + static Map assertData(String baseTemplatesPath, List> events, List> coverages, Map additionalReplacements, List ignoredTags) { events.sort(EVENT_RESOURCE_COMPARATOR) def labelGenerator = new LabelGenerator() @@ -99,6 +115,9 @@ abstract class CiVisibilityTestUtils { replacementMap.put(labelGenerator.forKey(e.key), "\"$e.value\"") } + // ignore provided tags + removeTags(events, ignoredTags) + def environment = System.getenv() def ciRun = environment.get("GITHUB_ACTION") != null || environment.get("GITLAB_CI") != null def comparisonMode = ciRun ? JSONCompareMode.LENIENT : JSONCompareMode.NON_EXTENSIBLE @@ -106,6 +125,7 @@ abstract class CiVisibilityTestUtils { def expectedEvents = getFreemarkerTemplate(baseTemplatesPath + "/events.ftl", replacementMap, events) def actualEvents = JSON_MAPPER.writeValueAsString(events) + try { JSONAssert.assertEquals(expectedEvents, actualEvents, comparisonMode) } catch (AssertionError e) { @@ -135,6 +155,55 @@ abstract class CiVisibilityTestUtils { return replacementMap } + static void removeTags(List> events, List tags) { + def ignoredTags = [] + for (String tagString : tags) { + ignoredTags.push(buildTag(tagString)) + } + + for (Map event : (events as List>)) { + Map map = event + for (List tag : ignoredTags) { + for (int i = 0; i < tag.size() - 1; ++i) { + Object currentValue = map.get(tag[i]) + + if (currentValue instanceof Map) { + map = (Map) currentValue + } else { + break + } + } + if (map instanceof Map) { + map.remove(tag[tag.size() - 1]) + } + } + } + } + + static List buildTag(String tagString) { + // consider anything inside "[]" as a block and split by '.' + def tag = [] + + def part = "" + def block = false + for (int i = 0; i < tagString.length(); ++i) { + def character = tagString.charAt(i) + if (character == '[' as char) { + block = true + } else if (character == ']' as char) { + block = false + } else if (character == '.' as char && !block) { + tag.add(part) + part = "" + } else { + part += character + } + } + + tag.add(part) + return tag + } + // Will sort traces in the following order: SESSION -> MODULE -> SUITE -> TEST static class SortTracesByType implements Comparator> { @Override diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy index 847b42634fe..7e7a883b1aa 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy @@ -227,7 +227,14 @@ class CucumberTest extends CiVisibilityInstrumentationTest { where: testcaseName | presentTags - "test-capabilities-base" | [DDTags.LIBRARY_CAPABILITIES_TIA, DDTags.LIBRARY_CAPABILITIES_ATR, DDTags.LIBRARY_CAPABILITIES_EFD, DDTags.LIBRARY_CAPABILITIES_QUARANTINE, DDTags.LIBRARY_CAPABILITIES_DISABLED, DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX] + "test-capabilities-base" | [ + DDTags.LIBRARY_CAPABILITIES_TIA, + DDTags.LIBRARY_CAPABILITIES_ATR, + DDTags.LIBRARY_CAPABILITIES_EFD, + DDTags.LIBRARY_CAPABILITIES_QUARANTINE, + DDTags.LIBRARY_CAPABILITIES_DISABLED, + DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX + ] } private String version() { diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy index a6f3b1c0937..29ca7bb28d4 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy @@ -169,7 +169,13 @@ class MUnitTest extends CiVisibilityInstrumentationTest { where: testcaseName | presentTags - "test-capabilities-base" | [DDTags.LIBRARY_CAPABILITIES_ATR, DDTags.LIBRARY_CAPABILITIES_EFD, DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS, DDTags.LIBRARY_CAPABILITIES_QUARANTINE, DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX] + "test-capabilities-base" | [ + DDTags.LIBRARY_CAPABILITIES_ATR, + DDTags.LIBRARY_CAPABILITIES_EFD, + DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS, + DDTags.LIBRARY_CAPABILITIES_QUARANTINE, + DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX + ] } private void runTests(Collection> tests, boolean expectSuccess = true) { diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Utils.java b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Utils.java index 72e7ab9efe8..8f36ee5a410 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Utils.java +++ b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Utils.java @@ -333,6 +333,7 @@ public static boolean isJUnitPlatformRunnerTest(Description description) { Object uniqueId = getUniqueId(description); return uniqueId != null && uniqueId.toString().contains("[engine:"); } + private static List cucumberCapabilities() { return Arrays.asList( LibraryCapability.TIA, diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy b/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy index e3eb8016288..601d4504ee8 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy @@ -231,7 +231,15 @@ class JUnit4Test extends CiVisibilityInstrumentationTest { where: testcaseName | presentTags - "test-capabilities-base" | [DDTags.LIBRARY_CAPABILITIES_TIA, DDTags.LIBRARY_CAPABILITIES_ATR, DDTags.LIBRARY_CAPABILITIES_EFD, DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS, DDTags.LIBRARY_CAPABILITIES_QUARANTINE, DDTags.LIBRARY_CAPABILITIES_DISABLED, DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX] + "test-capabilities-base" | [ + DDTags.LIBRARY_CAPABILITIES_TIA, + DDTags.LIBRARY_CAPABILITIES_ATR, + DDTags.LIBRARY_CAPABILITIES_EFD, + DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS, + DDTags.LIBRARY_CAPABILITIES_QUARANTINE, + DDTags.LIBRARY_CAPABILITIES_DISABLED, + DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX + ] } private void runTests(Collection> tests, boolean expectSuccess = true) { diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy index ba9db268ce9..a4023a994dc 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy @@ -235,7 +235,14 @@ class CucumberTest extends CiVisibilityInstrumentationTest { where: testcaseName | presentTags - "test-capabilities-base" | [DDTags.LIBRARY_CAPABILITIES_TIA, DDTags.LIBRARY_CAPABILITIES_ATR, DDTags.LIBRARY_CAPABILITIES_EFD, DDTags.LIBRARY_CAPABILITIES_QUARANTINE, DDTags.LIBRARY_CAPABILITIES_DISABLED, DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX] + "test-capabilities-base" | [ + DDTags.LIBRARY_CAPABILITIES_TIA, + DDTags.LIBRARY_CAPABILITIES_ATR, + DDTags.LIBRARY_CAPABILITIES_EFD, + DDTags.LIBRARY_CAPABILITIES_QUARANTINE, + DDTags.LIBRARY_CAPABILITIES_DISABLED, + DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX + ] } private String parameterizedTestNameSuffix() { diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy index de327a5c39c..58dda0075c4 100644 --- a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy @@ -111,7 +111,16 @@ class JUnit58Test extends CiVisibilityInstrumentationTest { where: testcaseName | presentTags | assumption - "test-capabilities-ordering" | [DDTags.LIBRARY_CAPABILITIES_TIA, DDTags.LIBRARY_CAPABILITIES_ATR, DDTags.LIBRARY_CAPABILITIES_EFD, DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS, DDTags.LIBRARY_CAPABILITIES_QUARANTINE, DDTags.LIBRARY_CAPABILITIES_DISABLED, DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX, DDTags.LIBRARY_CAPABILITIES_FAIL_FAST_TEST_ORDER] | JUnitPlatformUtils.isJunitTestOrderingSupported(instrumentedLibraryVersion()) + "test-capabilities-ordering" | [ + DDTags.LIBRARY_CAPABILITIES_TIA, + DDTags.LIBRARY_CAPABILITIES_ATR, + DDTags.LIBRARY_CAPABILITIES_EFD, + DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS, + DDTags.LIBRARY_CAPABILITIES_QUARANTINE, + DDTags.LIBRARY_CAPABILITIES_DISABLED, + DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX, + DDTags.LIBRARY_CAPABILITIES_FAIL_FAST_TEST_ORDER + ] | JUnitPlatformUtils.isJunitTestOrderingSupported(instrumentedLibraryVersion()) } private static void runTests(List> tests, boolean expectSuccess = true) { diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy index 40266260660..32231ed0a7f 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy @@ -237,7 +237,15 @@ class SpockTest extends CiVisibilityInstrumentationTest { where: testcaseName | presentTags - "test-capabilities-base" | [DDTags.LIBRARY_CAPABILITIES_TIA, DDTags.LIBRARY_CAPABILITIES_ATR, DDTags.LIBRARY_CAPABILITIES_EFD, DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS, DDTags.LIBRARY_CAPABILITIES_QUARANTINE, DDTags.LIBRARY_CAPABILITIES_DISABLED, DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX] + "test-capabilities-base" | [ + DDTags.LIBRARY_CAPABILITIES_TIA, + DDTags.LIBRARY_CAPABILITIES_ATR, + DDTags.LIBRARY_CAPABILITIES_EFD, + DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS, + DDTags.LIBRARY_CAPABILITIES_QUARANTINE, + DDTags.LIBRARY_CAPABILITIES_DISABLED, + DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX + ] } private static void runTests(List> classes, boolean expectSuccess = true) { diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy b/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy index a8c39898129..ebb593965b1 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy @@ -272,7 +272,15 @@ class JUnit5Test extends CiVisibilityInstrumentationTest { where: testcaseName | presentTags | assumption - "test-capabilities-base" | [DDTags.LIBRARY_CAPABILITIES_TIA, DDTags.LIBRARY_CAPABILITIES_ATR, DDTags.LIBRARY_CAPABILITIES_EFD, DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS, DDTags.LIBRARY_CAPABILITIES_QUARANTINE, DDTags.LIBRARY_CAPABILITIES_DISABLED, DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX] | !JUnitPlatformUtils.isJunitTestOrderingSupported(instrumentedLibraryVersion()) + "test-capabilities-base" | [ + DDTags.LIBRARY_CAPABILITIES_TIA, + DDTags.LIBRARY_CAPABILITIES_ATR, + DDTags.LIBRARY_CAPABILITIES_EFD, + DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS, + DDTags.LIBRARY_CAPABILITIES_QUARANTINE, + DDTags.LIBRARY_CAPABILITIES_DISABLED, + DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX + ] | !JUnitPlatformUtils.isJunitTestOrderingSupported(instrumentedLibraryVersion()) } protected void runTests(List> tests, boolean expectSuccess = true) { diff --git a/dd-java-agent/instrumentation/scalatest/src/test/groovy/ScalatestTest.groovy b/dd-java-agent/instrumentation/scalatest/src/test/groovy/ScalatestTest.groovy index be6f723fecf..e45fa1c7999 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/groovy/ScalatestTest.groovy +++ b/dd-java-agent/instrumentation/scalatest/src/test/groovy/ScalatestTest.groovy @@ -22,7 +22,6 @@ import org.example.TestSucceedMoreCases import org.example.TestSucceedParameterized import org.example.TestSucceedSlow import org.example.TestSucceedUnskippable -import org.junit.jupiter.api.Assumptions import org.scalatest.tools.Runner class ScalatestTest extends CiVisibilityInstrumentationTest { @@ -204,7 +203,15 @@ class ScalatestTest extends CiVisibilityInstrumentationTest { where: testcaseName | presentTags - "test-capabilities-base" | [DDTags.LIBRARY_CAPABILITIES_TIA, DDTags.LIBRARY_CAPABILITIES_ATR, DDTags.LIBRARY_CAPABILITIES_EFD, DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS, DDTags.LIBRARY_CAPABILITIES_QUARANTINE, DDTags.LIBRARY_CAPABILITIES_DISABLED, DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX] + "test-capabilities-base" | [ + DDTags.LIBRARY_CAPABILITIES_TIA, + DDTags.LIBRARY_CAPABILITIES_ATR, + DDTags.LIBRARY_CAPABILITIES_EFD, + DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS, + DDTags.LIBRARY_CAPABILITIES_QUARANTINE, + DDTags.LIBRARY_CAPABILITIES_DISABLED, + DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX + ] } @Override diff --git a/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGUtils.java b/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGUtils.java index 698db244e3e..c5c16352d51 100644 --- a/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGUtils.java +++ b/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGUtils.java @@ -5,6 +5,7 @@ import datadog.trace.api.civisibility.config.TestIdentifier; import datadog.trace.api.civisibility.config.TestSourceData; import datadog.trace.api.civisibility.events.TestSuiteDescriptor; +import datadog.trace.util.ComparableVersion; import java.io.InputStream; import java.lang.invoke.MethodHandle; import java.lang.reflect.Method; @@ -14,8 +15,6 @@ import java.util.Collections; import java.util.List; import java.util.Properties; - -import datadog.trace.util.ComparableVersion; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.IClass; 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 9c3aee98965..8d1bbd64c89 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 @@ -191,6 +191,13 @@ "duration" : ${content_duration_6}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "true", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_6}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -239,6 +246,13 @@ "duration" : ${content_duration_7}, "error" : 1, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "true", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -294,6 +308,13 @@ "duration" : ${content_duration_8}, "error" : 1, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "true", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -351,6 +372,13 @@ "duration" : ${content_duration_9}, "error" : 1, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "true", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_9}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -408,6 +436,13 @@ "duration" : ${content_duration_10}, "error" : 1, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "true", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_10}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -465,6 +500,13 @@ "duration" : ${content_duration_11}, "error" : 1, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "true", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_11}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, 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 bd3903f8a3c..a7e5a3b029f 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 @@ -139,6 +139,13 @@ "duration" : ${content_duration_5}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_5}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -187,6 +194,13 @@ "duration" : ${content_duration_6}, "error" : 1, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_6}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, 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 d450b99dd00..525ae412e53 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 @@ -191,6 +191,13 @@ "duration" : ${content_duration_6}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_6}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -239,6 +246,13 @@ "duration" : ${content_duration_7}, "error" : 1, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-gradle-plugin-test/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-gradle-plugin-test/events.ftl index 4cc0fb7e6f6..ab50889a89b 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-gradle-plugin-test/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-gradle-plugin-test/events.ftl @@ -185,11 +185,19 @@ "duration" : ${content_duration_6}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.fail_fast_test_order" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_6}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit5", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -218,7 +226,7 @@ "test.source.end" : 40, "test.source.start" : 16 }, - "name" : "junit.test_suite", + "name" : "junit5.test_suite", "resource" : "datadog.smoke.HelloPluginFunctionalTest", "service" : "test-gradle-service", "start" : ${content_start_6}, @@ -233,11 +241,19 @@ "duration" : ${content_duration_7}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.fail_fast_test_order" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, "ci.workspace_path" : ${content_meta_ci_workspace_path}, - "component" : "junit", + "component" : "junit5", "env" : "integration-test", "language" : "jvm", "library_version" : ${content_meta_library_version}, @@ -268,7 +284,7 @@ "test.source.end" : 39, "test.source.start" : 30 }, - "name" : "junit.test", + "name" : "junit5.test", "parent_id" : ${content_parent_id}, "resource" : "datadog.smoke.HelloPluginFunctionalTest.pluginPrintsHelloMessageOnGradle85", "service" : "test-gradle-service", 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 efef18567e5..5f9f8e2f044 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 @@ -187,6 +187,14 @@ "duration" : ${content_duration_6}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.fail_fast_test_order" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_6}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -235,6 +243,14 @@ "duration" : ${content_duration_7}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.fail_fast_test_order" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -288,6 +304,14 @@ "duration" : ${content_duration_8}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.fail_fast_test_order" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, 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 87c1fc8b342..201719fee7a 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 @@ -137,6 +137,13 @@ "duration" : ${content_duration_5}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_5}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -185,6 +192,13 @@ "duration" : ${content_duration_6}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_6}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -238,6 +252,13 @@ "duration" : ${content_duration_7}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, 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 567ef02b425..2fe41431bbf 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/coverages.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/coverages.ftl @@ -1,15 +1,4 @@ [ { - "files" : [ { - "bitmap" : "AAE=", - "filename" : "src/main/java/datadog/smoke/Calculator.java" - }, { - "bitmap" : "AAw=", - "filename" : "src/test/java/datadog/smoke/TestSucceedJunit5.java" - } ], - "span_id" : ${content_span_id_5}, - "test_session_id" : ${content_test_session_id}, - "test_suite_id" : ${content_test_suite_id_2} -}, { "files" : [ { "bitmap" : "gAw=", "filename" : "src/test/java/datadog/smoke/TestSucceed.java" @@ -20,4 +9,15 @@ "span_id" : ${content_span_id_4}, "test_session_id" : ${content_test_session_id}, "test_suite_id" : ${content_test_suite_id} +}, { + "files" : [ { + "bitmap" : "AAE=", + "filename" : "src/main/java/datadog/smoke/Calculator.java" + }, { + "bitmap" : "AAw=", + "filename" : "src/test/java/datadog/smoke/TestSucceedJunit5.java" + } ], + "span_id" : ${content_span_id_5}, + "test_session_id" : ${content_test_session_id}, + "test_suite_id" : ${content_test_suite_id_2} } ] \ 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 fb67fceb29c..82d5a711b9a 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 @@ -136,6 +136,13 @@ "duration" : ${content_duration_5}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_5}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -184,6 +191,13 @@ "duration" : ${content_duration_6}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_6}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -237,6 +251,14 @@ "duration" : ${content_duration_7}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.fail_fast_test_order" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -285,6 +307,14 @@ "duration" : ${content_duration_8}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.fail_fast_test_order" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, 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 567ef02b425..2fe41431bbf 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,15 +1,4 @@ [ { - "files" : [ { - "bitmap" : "AAE=", - "filename" : "src/main/java/datadog/smoke/Calculator.java" - }, { - "bitmap" : "AAw=", - "filename" : "src/test/java/datadog/smoke/TestSucceedJunit5.java" - } ], - "span_id" : ${content_span_id_5}, - "test_session_id" : ${content_test_session_id}, - "test_suite_id" : ${content_test_suite_id_2} -}, { "files" : [ { "bitmap" : "gAw=", "filename" : "src/test/java/datadog/smoke/TestSucceed.java" @@ -20,4 +9,15 @@ "span_id" : ${content_span_id_4}, "test_session_id" : ${content_test_session_id}, "test_suite_id" : ${content_test_suite_id} +}, { + "files" : [ { + "bitmap" : "AAE=", + "filename" : "src/main/java/datadog/smoke/Calculator.java" + }, { + "bitmap" : "AAw=", + "filename" : "src/test/java/datadog/smoke/TestSucceedJunit5.java" + } ], + "span_id" : ${content_span_id_5}, + "test_session_id" : ${content_test_session_id}, + "test_suite_id" : ${content_test_suite_id_2} } ] \ No newline at end of file diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/events.ftl index ab6dd435cc6..009f7d85bd4 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 @@ -185,6 +185,13 @@ "duration" : ${content_duration_6}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_6}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -233,6 +240,13 @@ "duration" : ${content_duration_7}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -286,6 +300,14 @@ "duration" : ${content_duration_8}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.fail_fast_test_order" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -334,6 +356,14 @@ "duration" : ${content_duration_9}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.fail_fast_test_order" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_9}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, 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 c261762f157..4f3814f3dac 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 @@ -95,6 +95,13 @@ "duration" : ${content_duration_3}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_3}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -143,6 +150,13 @@ "duration" : ${content_duration_4}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_4}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -191,6 +205,13 @@ "duration" : ${content_duration_5}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_5}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -244,6 +265,13 @@ "duration" : ${content_duration_6}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_6}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, 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 4056720810b..923758a03e6 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 @@ -144,6 +144,13 @@ "duration" : ${content_duration_4}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_4}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -192,6 +199,13 @@ "duration" : ${content_duration_5}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_5}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -240,6 +254,13 @@ "duration" : ${content_duration_6}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_6}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -293,6 +314,13 @@ "duration" : ${content_duration_7}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, 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 736874b5af5..9ff70a22e3e 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 @@ -187,6 +187,13 @@ "duration" : ${content_duration_6}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_6}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -235,6 +242,13 @@ "duration" : ${content_duration_7}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -288,6 +302,13 @@ "duration" : ${content_duration_8}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, 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 abf6bc9aacb..3c87f2ca64a 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 @@ -137,6 +137,13 @@ "duration" : ${content_duration_5}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_5}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -185,6 +192,13 @@ "duration" : ${content_duration_6}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_6}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -238,6 +252,13 @@ "duration" : ${content_duration_7}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "false", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, 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 b59b5300c95..c9decf983cd 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 @@ -257,6 +257,13 @@ "duration" : ${content_duration_8}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "true", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "false", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -305,6 +312,13 @@ "duration" : ${content_duration_9}, "error" : 1, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "true", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "false", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_9}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -360,6 +374,13 @@ "duration" : ${content_duration_10}, "error" : 1, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "true", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "false", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_10}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -417,6 +438,13 @@ "duration" : ${content_duration_11}, "error" : 1, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "true", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "false", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_11}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -474,6 +502,13 @@ "duration" : ${content_duration_12}, "error" : 1, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "true", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "false", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_12}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -531,6 +566,13 @@ "duration" : ${content_duration_13}, "error" : 1, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "true", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "false", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_13}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, 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 a4a29faf098..30c5b44c967 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 @@ -261,6 +261,13 @@ "duration" : ${content_duration_8}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -309,6 +316,13 @@ "duration" : ${content_duration_9}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_9}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -362,6 +376,13 @@ "duration" : ${content_duration_10}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_10}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, 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 fcd2fb63f19..b5f05732b11 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 @@ -225,6 +225,13 @@ "duration" : ${content_duration_7}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -273,6 +280,13 @@ "duration" : ${content_duration_8}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -326,6 +340,13 @@ "duration" : ${content_duration_9}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_9}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_impacted_tests/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_impacted_tests/events.ftl index fdc76099e58..d0294527fd6 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_impacted_tests/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_impacted_tests/events.ftl @@ -223,6 +223,13 @@ "duration" : ${content_duration_7}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -271,6 +278,13 @@ "duration" : ${content_duration_8}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -325,6 +339,13 @@ "duration" : ${content_duration_9}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_9}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, 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 b1d40342764..415e5c1b1ef 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 @@ -281,6 +281,13 @@ "duration" : ${content_duration_9}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "false", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_9}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -326,6 +333,13 @@ "duration" : ${content_duration_10}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "false", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_10}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/events.ftl index 8ac978d4f71..654a68d08a1 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/events.ftl @@ -261,6 +261,14 @@ "duration" : ${content_duration_8}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.fail_fast_test_order" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -309,6 +317,14 @@ "duration" : ${content_duration_9}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.fail_fast_test_order" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_9}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -362,6 +378,14 @@ "duration" : ${content_duration_10}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.fail_fast_test_order" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_10}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, 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 a4a29faf098..30c5b44c967 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 @@ -261,6 +261,13 @@ "duration" : ${content_duration_8}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -309,6 +316,13 @@ "duration" : ${content_duration_9}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_9}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -362,6 +376,13 @@ "duration" : ${content_duration_10}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_10}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, 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 a4a29faf098..30c5b44c967 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 @@ -261,6 +261,13 @@ "duration" : ${content_duration_8}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -309,6 +316,13 @@ "duration" : ${content_duration_9}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_9}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -362,6 +376,13 @@ "duration" : ${content_duration_10}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_10}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/events.ftl index 20a78c831d7..f10096d024a 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/events.ftl @@ -225,6 +225,13 @@ "duration" : ${content_duration_7}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "true", + "_dd.library_capabilities.test_management.disable" : "true", + "_dd.library_capabilities.test_management.quarantine" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -273,6 +280,13 @@ "duration" : ${content_duration_8}, "error" : 1, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "true", + "_dd.library_capabilities.test_management.disable" : "true", + "_dd.library_capabilities.test_management.quarantine" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -330,6 +344,13 @@ "duration" : ${content_duration_9}, "error" : 1, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "true", + "_dd.library_capabilities.test_management.disable" : "true", + "_dd.library_capabilities.test_management.quarantine" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid_9}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -389,6 +410,13 @@ "duration" : ${content_duration_10}, "error" : 1, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "true", + "_dd.library_capabilities.test_management.disable" : "true", + "_dd.library_capabilities.test_management.quarantine" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid_10}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -448,6 +476,13 @@ "duration" : ${content_duration_11}, "error" : 1, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "true", + "_dd.library_capabilities.test_management.disable" : "true", + "_dd.library_capabilities.test_management.quarantine" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid_11}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -507,6 +542,13 @@ "duration" : ${content_duration_12}, "error" : 1, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "true", + "_dd.library_capabilities.test_management.disable" : "true", + "_dd.library_capabilities.test_management.quarantine" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid_12}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -567,6 +609,13 @@ "duration" : ${content_duration_13}, "error" : 1, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "true", + "_dd.library_capabilities.test_management.disable" : "true", + "_dd.library_capabilities.test_management.quarantine" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid_13}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -623,6 +672,13 @@ "duration" : ${content_duration_14}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "true", + "_dd.library_capabilities.test_management.disable" : "true", + "_dd.library_capabilities.test_management.quarantine" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid_14}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -671,6 +727,13 @@ "duration" : ${content_duration_15}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "true", + "_dd.library_capabilities.test_management.disable" : "true", + "_dd.library_capabilities.test_management.quarantine" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid_15}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, 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 bcfa36fb89b..9e13f85400a 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 @@ -217,6 +217,13 @@ "duration" : ${content_duration_7}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "false", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -265,6 +272,13 @@ "duration" : ${content_duration_8}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "false", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, 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 1bda6c6aa80..5885f14fbf6 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 @@ -318,6 +318,12 @@ "duration" : ${content_duration_10}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.test_impact_analysis" : "false", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_10}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -363,6 +369,12 @@ "duration" : ${content_duration_11}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.test_impact_analysis" : "false", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_11}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, 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 8507b84386a..d35ed072d26 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 @@ -261,6 +261,13 @@ "duration" : ${content_duration_8}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -309,6 +316,13 @@ "duration" : ${content_duration_9}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_9}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -362,6 +376,13 @@ "duration" : ${content_duration_10}, "error" : 0, "meta" : { + "_dd.library_capabilities.auto_test_retries" : "false", + "_dd.library_capabilities.early_flake_detection" : "false", + "_dd.library_capabilities.impacted_tests" : "true", + "_dd.library_capabilities.test_impact_analysis" : "true", + "_dd.library_capabilities.test_management.attempt_to_fix" : "false", + "_dd.library_capabilities.test_management.disable" : "false", + "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_10}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, From c0cf509489492da1d3b46db7f58d4e223b9d16c4 Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Tue, 4 Mar 2025 13:06:20 +0100 Subject: [PATCH 26/41] jacoco test coverage excludes --- internal-api/build.gradle | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/internal-api/build.gradle b/internal-api/build.gradle index 1e8f8c37020..44002215203 100644 --- a/internal-api/build.gradle +++ b/internal-api/build.gradle @@ -107,6 +107,7 @@ excludedClassesCoverage += [ "datadog.trace.api.civisibility.config.TestFQN", "datadog.trace.api.civisibility.config.TestMetadata", "datadog.trace.api.civisibility.config.TestSourceData", + "datadog.trace.api.civisibility.config.LibraryCapability", "datadog.trace.api.civisibility.coverage.CoveragePerTestBridge", "datadog.trace.api.civisibility.coverage.CoveragePercentageBridge", "datadog.trace.api.civisibility.coverage.NoOpCoverageStore", @@ -167,6 +168,11 @@ excludedClassesCoverage += [ "datadog.trace.util.ClassNameTrie.JavaGenerator", "datadog.trace.util.CollectionUtils", "datadog.trace.util.ComparableVersion", + "datadog.trace.util.ComparableVersion.BigIntegerItem", + "datadog.trace.util.ComparableVersion.IntItem", + "datadog.trace.util.ComparableVersion.ListItem", + "datadog.trace.util.ComparableVersion.LongItem", + "datadog.trace.util.ComparableVersion.StringItem", "datadog.trace.util.ConcurrentEnumMap", "datadog.trace.util.MethodHandles", "datadog.trace.util.PidHelper", From 6792874625f1c76e0026df31901ce8fca98cba65 Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Tue, 4 Mar 2025 13:19:44 +0100 Subject: [PATCH 27/41] fix code quality violations --- .../main/java/datadog/trace/util/ComparableVersion.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/internal-api/src/main/java/datadog/trace/util/ComparableVersion.java b/internal-api/src/main/java/datadog/trace/util/ComparableVersion.java index a0ba6b34236..cadaf7d1d78 100644 --- a/internal-api/src/main/java/datadog/trace/util/ComparableVersion.java +++ b/internal-api/src/main/java/datadog/trace/util/ComparableVersion.java @@ -404,7 +404,9 @@ public String toString() { } private static class ListItem extends ArrayList implements Item { - private ListItem() {} + private ListItem() { + super(); + } public int getType() { return 2; @@ -483,7 +485,7 @@ public String toString() { private String toListString() { StringBuilder buffer = new StringBuilder(); - buffer.append("["); + buffer.append('['); for (Item item : this) { if (buffer.length() > 1) { @@ -497,7 +499,7 @@ private String toListString() { } } - buffer.append("]"); + buffer.append(']'); return buffer.toString(); } } From 2bee4c29b9e6ac5986cc75a047d0c56b5731603b Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Tue, 4 Mar 2025 13:21:48 +0100 Subject: [PATCH 28/41] remove leftover maven dependency for karate --- dd-java-agent/instrumentation/karate/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/dd-java-agent/instrumentation/karate/build.gradle b/dd-java-agent/instrumentation/karate/build.gradle index 05314c19173..2832208a3f2 100644 --- a/dd-java-agent/instrumentation/karate/build.gradle +++ b/dd-java-agent/instrumentation/karate/build.gradle @@ -30,7 +30,6 @@ dependencies { testImplementation testFixtures(project(':dd-java-agent:agent-ci-visibility')) testImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.8.2' testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.8.2' - testImplementation group: 'org.apache.maven', name: 'maven-artifact', version: '3.9.9' testImplementation (group: 'com.intuit.karate', name: 'karate-core', version: '1.0.0') { // excluding logback to avoid conflicts with libs.bundles.test.logging From bc8ab0c08d4bd2046cbde870effce7c542ff90fa Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Tue, 4 Mar 2025 13:30:33 +0100 Subject: [PATCH 29/41] bugs and spotless fix --- .../trace/instrumentation/junit5/JUnitPlatformUtils.java | 1 - .../src/main/java/datadog/trace/util/ComparableVersion.java | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java index 03c752a9297..f227863cd4b 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java +++ b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java @@ -6,7 +6,6 @@ import datadog.trace.api.civisibility.config.TestIdentifier; import datadog.trace.api.civisibility.config.TestSourceData; import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes; diff --git a/internal-api/src/main/java/datadog/trace/util/ComparableVersion.java b/internal-api/src/main/java/datadog/trace/util/ComparableVersion.java index cadaf7d1d78..147607c71f0 100644 --- a/internal-api/src/main/java/datadog/trace/util/ComparableVersion.java +++ b/internal-api/src/main/java/datadog/trace/util/ComparableVersion.java @@ -336,6 +336,9 @@ private static class StringItem implements Item { break; case 'm': value = "milestone"; + break; + default: + break; } } From bf6d2375a435ebcf152898523ad659ca6f3cc07f Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Tue, 4 Mar 2025 14:50:01 +0100 Subject: [PATCH 30/41] ignore tags with JsonPaths instead of custom implementation --- .../civisibility/CiVisibilityTestUtils.groovy | 60 ++++++------------- 1 file changed, 19 insertions(+), 41 deletions(-) diff --git a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityTestUtils.groovy b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityTestUtils.groovy index a9873088888..3dc5effbd4f 100644 --- a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityTestUtils.groovy +++ b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityTestUtils.groovy @@ -7,24 +7,14 @@ import com.jayway.jsonpath.JsonPath import com.jayway.jsonpath.Option import com.jayway.jsonpath.ReadContext import com.jayway.jsonpath.WriteContext -import datadog.trace.agent.test.asserts.ListWriterAssert -import datadog.trace.api.Config import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDTags -import datadog.trace.civisibility.ci.CIProviderInfoFactory -import datadog.trace.civisibility.ci.GitLabInfo -import datadog.trace.civisibility.ci.GithubActionsInfo -import datadog.trace.civisibility.ci.env.CiEnvironment -import datadog.trace.civisibility.ci.env.CiEnvironmentImpl -import datadog.trace.common.writer.ListWriter import datadog.trace.core.DDSpan import freemarker.core.Environment import freemarker.core.InvalidReferenceException import freemarker.template.Template import freemarker.template.TemplateException import freemarker.template.TemplateExceptionHandler -import groovy.transform.stc.ClosureParams -import groovy.transform.stc.SimpleType import org.skyscreamer.jsonassert.JSONAssert import org.skyscreamer.jsonassert.JSONCompareMode @@ -64,14 +54,14 @@ abstract class CiVisibilityTestUtils { // ignored tags on assertion and fixture build static final List IGNORED_TAGS = [ - "content.meta.[$DDTags.LIBRARY_CAPABILITIES_TIA]", - "content.meta.[$DDTags.LIBRARY_CAPABILITIES_EFD]", - "content.meta.[$DDTags.LIBRARY_CAPABILITIES_ATR]", - "content.meta.[$DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS]", - "content.meta.[$DDTags.LIBRARY_CAPABILITIES_FAIL_FAST_TEST_ORDER]", - "content.meta.[$DDTags.LIBRARY_CAPABILITIES_QUARANTINE]", - "content.meta.[$DDTags.LIBRARY_CAPABILITIES_DISABLED]", - "content.meta.[$DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX]", + "content.meta.['$DDTags.LIBRARY_CAPABILITIES_TIA']", + "content.meta.['$DDTags.LIBRARY_CAPABILITIES_EFD']", + "content.meta.['$DDTags.LIBRARY_CAPABILITIES_ATR']", + "content.meta.['$DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS']", + "content.meta.['$DDTags.LIBRARY_CAPABILITIES_FAIL_FAST_TEST_ORDER']", + "content.meta.['$DDTags.LIBRARY_CAPABILITIES_QUARANTINE']", + "content.meta.['$DDTags.LIBRARY_CAPABILITIES_DISABLED']", + "content.meta.['$DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX']", ] static final List COVERAGE_DYNAMIC_PATHS = [path("test_session_id"), path("test_suite_id"), path("span_id"),] @@ -89,7 +79,7 @@ abstract class CiVisibilityTestUtils { */ static void generateTemplates(String baseTemplatesPath, List> events, List> coverages, Map additionalReplacements, List ignoredTags = []) { if (!ignoredTags.empty) { - removeTags(events, ignoredTags) + events = removeTags(events, ignoredTags) } events.sort(EVENT_RESOURCE_COMPARATOR) @@ -116,7 +106,7 @@ abstract class CiVisibilityTestUtils { } // ignore provided tags - removeTags(events, ignoredTags) + events = removeTags(events, ignoredTags) def environment = System.getenv() def ciRun = environment.get("GITHUB_ACTION") != null || environment.get("GITLAB_CI") != null @@ -125,7 +115,6 @@ abstract class CiVisibilityTestUtils { def expectedEvents = getFreemarkerTemplate(baseTemplatesPath + "/events.ftl", replacementMap, events) def actualEvents = JSON_MAPPER.writeValueAsString(events) - try { JSONAssert.assertEquals(expectedEvents, actualEvents, comparisonMode) } catch (AssertionError e) { @@ -155,29 +144,18 @@ abstract class CiVisibilityTestUtils { return replacementMap } - static void removeTags(List> events, List tags) { - def ignoredTags = [] - for (String tagString : tags) { - ignoredTags.push(buildTag(tagString)) - } - - for (Map event : (events as List>)) { - Map map = event - for (List tag : ignoredTags) { - for (int i = 0; i < tag.size() - 1; ++i) { - Object currentValue = map.get(tag[i]) + static List> removeTags(List> events, List tags) { + def filteredEvents = [] - if (currentValue instanceof Map) { - map = (Map) currentValue - } else { - break - } - } - if (map instanceof Map) { - map.remove(tag[tag.size() - 1]) - } + for (Map event : events) { + ReadContext ctx = JsonPath.parse(event, JSON_PATH_CONFIG) + for (String tag : tags) { + ctx.delete(path(tag).path) } + filteredEvents.add(ctx.json()) } + + return filteredEvents } static List buildTag(String tagString) { From b07373686b76549a4bf371d373ef0baa9ff51e6c Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Tue, 4 Mar 2025 15:16:58 +0100 Subject: [PATCH 31/41] clean up arePresent and areNotPresent in TagsAssert --- .../groovy/datadog/trace/agent/test/asserts/TagsAssert.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TagsAssert.groovy b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TagsAssert.groovy index 6a32ddcc580..cb361270cec 100644 --- a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TagsAssert.groovy +++ b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TagsAssert.groovy @@ -58,7 +58,7 @@ class TagsAssert { def arePresent(Collection tags) { for (String name : tags) { - tag(name, { it != null }) + isPresent(name) } } @@ -68,7 +68,7 @@ class TagsAssert { def areNotPresent(Collection tags) { for (String name : tags) { - tag(name, { it == null }) + isNotPresent(name) } } From 0de9f87cdec1d780b0cf3f531d563ec57ad7329b Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Tue, 4 Mar 2025 15:32:56 +0100 Subject: [PATCH 32/41] add check for null framework versions --- .../datadog/trace/instrumentation/karate/KarateUtils.java | 8 ++++---- .../datadog/trace/instrumentation/testng/TestNGUtils.java | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateUtils.java b/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateUtils.java index 1366fddc24c..77f2f340e43 100644 --- a/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateUtils.java +++ b/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateUtils.java @@ -143,12 +143,12 @@ public static String getKarateVersion() { return FileUtils.KARATE_VERSION; } - public static boolean isSkippingSupported(String frameworkVersion) { - return karateV12.compareTo(new ComparableVersion(frameworkVersion)) <= 0; + public static boolean isSkippingSupported(String version) { + return version != null && karateV12.compareTo(new ComparableVersion(version)) <= 0; } - public static boolean isSetupTagSupported(String frameworkVersion) { - return karateV13.compareTo(new ComparableVersion(frameworkVersion)) <= 0; + public static boolean isSetupTagSupported(String version) { + return version != null && karateV13.compareTo(new ComparableVersion(version)) <= 0; } public static List availableCapabilities(String frameworkVersion) { diff --git a/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGUtils.java b/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGUtils.java index 6b60f9fb366..dbea944e8bc 100644 --- a/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGUtils.java +++ b/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestNGUtils.java @@ -267,15 +267,15 @@ public static TestSuiteDescriptor toSuiteDescriptor(ITestClass testClass) { } public static boolean isEFDSupported(String version) { - return testNGv75.compareTo(new ComparableVersion(version)) <= 0; + return version != null && testNGv75.compareTo(new ComparableVersion(version)) <= 0; } public static boolean isExceptionSuppressionSupported(String version) { - return testNGv75.compareTo(new ComparableVersion(version)) <= 0; + return version != null && testNGv75.compareTo(new ComparableVersion(version)) <= 0; } public static boolean isTestOrderingSupported(String version) { - return testNGv70.compareTo(new ComparableVersion(version)) <= 0; + return version != null && testNGv70.compareTo(new ComparableVersion(version)) <= 0; } public static List availableCapabilities(String version) { From 877fc63eb6b5afdfeee044afce4a350670f7f43c Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Tue, 4 Mar 2025 16:38:25 +0100 Subject: [PATCH 33/41] remove capabilites propagation --- .../civisibility/domain/TestSuiteImpl.java | 7 +--- .../domain/headless/HeadlessTestModule.java | 7 +--- .../domain/headless/HeadlessTestSession.java | 1 - .../trace/civisibility/utils/SpanUtils.java | 8 ----- .../civisibility/domain/TestImplTest.groovy | 20 +++++++++-- .../headless/HeadlessTestSessionTest.groovy | 33 ++---------------- .../test/ExecutionStrategyTest.groovy | 32 +++++++++++++++++ .../civisibility/CiVisibilityTestUtils.groovy | 34 +++---------------- .../src/test/groovy/CucumberTest.groovy | 2 +- .../src/test/groovy/MUnitTest.groovy | 2 +- .../src/test/groovy/JUnit4Test.groovy | 2 +- .../src/test/groovy/CucumberTest.groovy | 2 +- .../src/test/groovy/JUnit58Test.groovy | 2 +- .../src/test/groovy/SpockTest.groovy | 2 +- .../src/test/groovy/JUnit5Test.groovy | 2 +- .../karate/src/test/groovy/KarateTest.groovy | 2 +- .../src/test/groovy/ScalatestTest.groovy | 2 +- .../instrumentation/testng/TestNGTest.groovy | 2 +- .../weaver/src/test/groovy/WeaverTest.groovy | 2 +- .../test-failed-flaky-retries/events.ftl | 7 ---- .../events.ftl | 7 ---- .../events.ftl | 7 ---- .../events.ftl | 8 ----- .../resources/test-succeed-junit-5/events.ftl | 8 ----- .../events.ftl | 7 ---- .../events.ftl | 15 -------- .../events.ftl | 15 -------- .../events.ftl | 14 -------- .../events.ftl | 14 -------- .../events.ftl | 7 ---- .../test-succeed-old-gradle/events.ftl | 7 ---- .../events.ftl | 7 ---- .../test_successful_maven_run/events.ftl | 7 ---- .../events.ftl | 7 ---- .../events.ftl | 7 ---- .../events.ftl | 7 ---- .../events.ftl | 8 ----- .../events.ftl | 7 ---- .../events.ftl | 7 ---- .../events.ftl | 14 -------- .../events.ftl | 7 ---- .../events.ftl | 6 ---- .../events.ftl | 7 ---- 43 files changed, 71 insertions(+), 300 deletions(-) diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java index 82168155002..308022d195d 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java @@ -265,11 +265,6 @@ public TestImpl testStart( coverageStoreFactory, executionResults, libraryCapabilities, - this::propagateTestTags); - } - - private void propagateTestTags(AgentSpan testSpan) { - SpanUtils.propagateCiVisibilityTags(span, testSpan); - SpanUtils.propagateLibraryCapabilities(span, testSpan); + SpanUtils.propagateCiVisibilityTagsTo(span)); } } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java index e3b1de1dfba..aa09413ada7 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java @@ -187,11 +187,6 @@ public TestSuiteImpl testSuiteStart( coverageStoreFactory, executionResults, libraryCapabilities, - this::propagateSuiteTags); - } - - private void propagateSuiteTags(AgentSpan suiteSpan) { - SpanUtils.propagateCiVisibilityTags(span, suiteSpan); - SpanUtils.propagateLibraryCapabilities(span, suiteSpan); + SpanUtils.propagateCiVisibilityTagsTo(span)); } } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java index 5b38a494ef7..906eda68627 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java @@ -90,7 +90,6 @@ public HeadlessTestModule testModuleStart(String moduleName, @Nullable Long star private void propagateModuleTags(AgentSpan moduleSpan) { SpanUtils.propagateCiVisibilityTags(span, moduleSpan); - SpanUtils.propagateLibraryCapabilities(span, moduleSpan); SpanUtils.propagateTags( span, moduleSpan, diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/SpanUtils.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/SpanUtils.java index 396a83b40c6..7e47ec79bfe 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/SpanUtils.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/SpanUtils.java @@ -2,7 +2,6 @@ import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.Tags; -import datadog.trace.civisibility.config.LibraryCapabilityUtils; import datadog.trace.civisibility.domain.TestStatus; import datadog.trace.civisibility.ipc.TestFramework; import java.util.ArrayList; @@ -33,13 +32,6 @@ public static void mergeTestFrameworks(AgentSpan span, Collection setFrameworks(span, merged); } - public static void propagateLibraryCapabilities(AgentSpan parentSpan, AgentSpan childSpan) { - propagateTags( - parentSpan, - childSpan, - LibraryCapabilityUtils.CAPABILITY_TAG_MAP.values().toArray(new String[0])); - } - private static Collection getFrameworks(AgentSpan span) { Object nameTag = span.getTag(Tags.TEST_FRAMEWORK); Object versionTag = span.getTag(Tags.TEST_FRAMEWORK_VERSION); diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy index e6adb4a3b6c..96903b8d8d0 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy @@ -3,7 +3,9 @@ package datadog.trace.civisibility.domain import datadog.trace.agent.test.asserts.ListWriterAssert import datadog.trace.api.Config import datadog.trace.api.DDSpanTypes +import datadog.trace.api.DDTags import datadog.trace.api.DDTraceId +import datadog.trace.api.civisibility.config.LibraryCapability import datadog.trace.api.civisibility.config.TestIdentifier import datadog.trace.api.civisibility.coverage.CoverageProbes import datadog.trace.api.civisibility.coverage.CoverageStore @@ -20,7 +22,7 @@ import datadog.trace.civisibility.test.ExecutionResults import datadog.trace.civisibility.utils.SpanUtils class TestImplTest extends SpanWriterTest { - def "test span is generated"() { + def "test span is generated and tags populated"() { setup: def test = givenATest() @@ -33,6 +35,13 @@ class TestImplTest extends SpanWriterTest { span(0) { parent() spanType DDSpanTypes.TEST + tags(false) { + "$DDTags.LIBRARY_CAPABILITIES_TIA" true + "$DDTags.LIBRARY_CAPABILITIES_EFD" false + "$DDTags.LIBRARY_CAPABILITIES_QUARANTINE" true + "$DDTags.LIBRARY_CAPABILITIES_DISABLED" false + "$DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX" true + } } } }) @@ -105,6 +114,13 @@ class TestImplTest extends SpanWriterTest { linesResolver.getMethodLines(_) >> LinesResolver.Lines.EMPTY def codeowners = NoCodeowners.INSTANCE + def libraryCapabilities = [ + (LibraryCapability.TIA) : true, + (LibraryCapability.EFD) : false, + (LibraryCapability.QUARANTINE) : true, + (LibraryCapability.DISABLED) : false, + (LibraryCapability.ATTEMPT_TO_FIX): true] + new TestImpl( moduleSpanContext, suiteId, @@ -126,7 +142,7 @@ class TestImplTest extends SpanWriterTest { codeowners, coverageStoreFactory, executionResults, - [:], + libraryCapabilities, SpanUtils.DO_NOT_PROPAGATE_CI_VISIBILITY_TAGS ) } diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/headless/HeadlessTestSessionTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/headless/HeadlessTestSessionTest.groovy index 9503481bf42..2b0ddfeeadb 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/headless/HeadlessTestSessionTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/headless/HeadlessTestSessionTest.groovy @@ -3,12 +3,9 @@ package datadog.trace.civisibility.domain.headless import datadog.trace.agent.test.asserts.ListWriterAssert import datadog.trace.api.Config import datadog.trace.api.DDSpanTypes -import datadog.trace.api.DDTags -import datadog.trace.api.civisibility.config.LibraryCapability import datadog.trace.api.civisibility.coverage.CoverageStore import datadog.trace.api.civisibility.telemetry.CiVisibilityMetricCollector import datadog.trace.api.civisibility.telemetry.tag.Provider -import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation import datadog.trace.bootstrap.instrumentation.api.Tags import datadog.trace.civisibility.codeowners.Codeowners import datadog.trace.civisibility.config.ExecutionSettings @@ -25,57 +22,33 @@ class HeadlessTestSessionTest extends SpanWriterTest { setup: def session = givenAHeadlessTestSession() def module = session.testModuleStart("module-name", null) - def suite = module.testSuiteStart("suite-name", MyClass, null, false, TestFrameworkInstrumentation.OTHER) - def test = suite.testStart("test-name", null, null, null) when: - test.end(null) - suite.end(null) module.end(null) session.end(null) then: - ListWriterAssert.assertTraces(TEST_WRITER, 2, false, { - trace(3) { + ListWriterAssert.assertTraces(TEST_WRITER, 1, false, { + trace(2) { span(0) { spanType DDSpanTypes.TEST_SESSION_END tags(false) { "$Tags.TEST_TEST_MANAGEMENT_ENABLED" true - "$DDTags.LIBRARY_CAPABILITIES_TIA" false - "$DDTags.LIBRARY_CAPABILITIES_EFD" false - "$DDTags.LIBRARY_CAPABILITIES_ATR" false - "$DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS" false - "$DDTags.LIBRARY_CAPABILITIES_FAIL_FAST_TEST_ORDER" false - "$DDTags.LIBRARY_CAPABILITIES_QUARANTINE" true - "$DDTags.LIBRARY_CAPABILITIES_DISABLED" true - "$DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX" true } } span(1) { spanType DDSpanTypes.TEST_MODULE_END } - span(2) { - spanType DDSpanTypes.TEST_SUITE_END - } - } - trace(1) { - span(0) { - spanType DDSpanTypes.TEST - } } }) } - private static final class MyClass {} - private HeadlessTestSession givenAHeadlessTestSession() { def executionSettings = Stub(ExecutionSettings) executionSettings.getTestManagementSettings() >> new TestManagementSettings(true, 10) def executionStrategy = new ExecutionStrategy(Stub(Config), executionSettings, Stub(SourcePathResolver), Stub(LinesResolver)) - def availableCapabilities = Arrays.asList(LibraryCapability.values()) - new HeadlessTestSession( "project-name", null, @@ -88,7 +61,7 @@ class HeadlessTestSessionTest extends SpanWriterTest { Stub(LinesResolver), Stub(CoverageStore.Factory), executionStrategy, - availableCapabilities + [] ) } } diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/test/ExecutionStrategyTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/test/ExecutionStrategyTest.groovy index 952f816110f..a412943df83 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/test/ExecutionStrategyTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/test/ExecutionStrategyTest.groovy @@ -1,6 +1,7 @@ package datadog.trace.civisibility.test import datadog.trace.api.Config +import datadog.trace.api.civisibility.config.LibraryCapability import datadog.trace.api.civisibility.config.TestFQN import datadog.trace.api.civisibility.config.TestIdentifier import datadog.trace.api.civisibility.config.TestMetadata @@ -108,6 +109,37 @@ class ExecutionStrategyTest extends Specification { policy.currentExecutionRetryReason() == RetryReason.attemptToFix } + def "test capabilities status: #testcaseName"() { + setup: + def testManagementSettings = Stub(TestManagementSettings) + testManagementSettings.isEnabled() >> false + + def earlyFlakeDetectionSettings = Stub(EarlyFlakeDetectionSettings) + earlyFlakeDetectionSettings.isEnabled() >> true + + def executionSettings = Stub(ExecutionSettings) + executionSettings.getTestManagementSettings() >> testManagementSettings + executionSettings.getEarlyFlakeDetectionSettings() >> earlyFlakeDetectionSettings + executionSettings.isFlakyTestRetriesEnabled() >> true + executionSettings.isImpactedTestsDetectionEnabled() >> true + + def strategy = givenAnExecutionStrategy(executionSettings) + def capabilitiesStatus = strategy.getCapabilitiesStatus() + + expect: + capabilitiesStatus.keySet() == new HashSet<>(LibraryCapability.values().toList()) + capabilitiesStatus == [ + (LibraryCapability.TIA) : false, + (LibraryCapability.EFD) : true, + (LibraryCapability.ATR) : true, + (LibraryCapability.IMPACTED) : true, + (LibraryCapability.FAIL_FAST) : false, + (LibraryCapability.QUARANTINE) : false, + (LibraryCapability.DISABLED) : false, + (LibraryCapability.ATTEMPT_TO_FIX): false, + ] + } + private ExecutionStrategy givenAnExecutionStrategy(ExecutionSettings executionSettings = ExecutionSettings.EMPTY) { def config = Config.get() def resolver = Stub(SourcePathResolver) diff --git a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityTestUtils.groovy b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityTestUtils.groovy index 3dc5effbd4f..ea06b4e07cc 100644 --- a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityTestUtils.groovy +++ b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityTestUtils.groovy @@ -158,31 +158,7 @@ abstract class CiVisibilityTestUtils { return filteredEvents } - static List buildTag(String tagString) { - // consider anything inside "[]" as a block and split by '.' - def tag = [] - - def part = "" - def block = false - for (int i = 0; i < tagString.length(); ++i) { - def character = tagString.charAt(i) - if (character == '[' as char) { - block = true - } else if (character == ']' as char) { - block = false - } else if (character == '.' as char && !block) { - tag.add(part) - part = "" - } else { - part += character - } - } - - tag.add(part) - return tag - } - - // Will sort traces in the following order: SESSION -> MODULE -> SUITE -> TEST + // Will sort traces in the following order: TEST -> SUITE -> MODULE -> SESSION static class SortTracesByType implements Comparator> { @Override int compare(List o1, List o2) { @@ -193,13 +169,13 @@ abstract class CiVisibilityTestUtils { assert !trace.isEmpty() def spanType = trace.get(0).getSpanType() switch (spanType) { - case DDSpanTypes.TEST_SESSION_END: + case DDSpanTypes.TEST: return 0 - case DDSpanTypes.TEST_MODULE_END: - return 1 case DDSpanTypes.TEST_SUITE_END: + return 1 + case DDSpanTypes.TEST_MODULE_END: return 2 - case DDSpanTypes.TEST: + case DDSpanTypes.TEST_SESSION_END: return 3 default: return 4 diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy index 7e7a883b1aa..40ca18f2524 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy @@ -216,7 +216,7 @@ class CucumberTest extends CiVisibilityInstrumentationTest { ListWriterAssert.assertTraces(TEST_WRITER, 4, true, new CiVisibilityTestUtils.SortTracesByType(), { trace(1) { span(0) { - spanType DDSpanTypes.TEST_SESSION_END + spanType DDSpanTypes.TEST tags(false) { arePresent(presentTags) areNotPresent(notPresentTags) diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy index 29ca7bb28d4..8d21612de30 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy @@ -158,7 +158,7 @@ class MUnitTest extends CiVisibilityInstrumentationTest { ListWriterAssert.assertTraces(TEST_WRITER, 4, true, new CiVisibilityTestUtils.SortTracesByType(), { trace(1) { span(0) { - spanType DDSpanTypes.TEST_SESSION_END + spanType DDSpanTypes.TEST tags(false) { arePresent(presentTags) areNotPresent(notPresentTags) diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy b/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy index 601d4504ee8..2e68b26c52e 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy @@ -220,7 +220,7 @@ class JUnit4Test extends CiVisibilityInstrumentationTest { ListWriterAssert.assertTraces(TEST_WRITER, 4, true, new CiVisibilityTestUtils.SortTracesByType(), { trace(1) { span(0) { - spanType DDSpanTypes.TEST_SESSION_END + spanType DDSpanTypes.TEST tags(false) { arePresent(presentTags) areNotPresent(notPresentTags) diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy index a4023a994dc..526717896d5 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy @@ -224,7 +224,7 @@ class CucumberTest extends CiVisibilityInstrumentationTest { ListWriterAssert.assertTraces(TEST_WRITER, 4, true, new CiVisibilityTestUtils.SortTracesByType(), { trace(1) { span(0) { - spanType DDSpanTypes.TEST_SESSION_END + spanType DDSpanTypes.TEST tags(false) { arePresent(presentTags) areNotPresent(notPresentTags) diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy index 58dda0075c4..5b2f8f659fd 100644 --- a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy @@ -100,7 +100,7 @@ class JUnit58Test extends CiVisibilityInstrumentationTest { ListWriterAssert.assertTraces(TEST_WRITER, 5, true, new CiVisibilityTestUtils.SortTracesByType(), { trace(1) { span(0) { - spanType DDSpanTypes.TEST_SESSION_END + spanType DDSpanTypes.TEST tags(false) { arePresent(presentTags) areNotPresent(notPresentTags) diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy index 32231ed0a7f..5cd5b21c8d3 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy @@ -226,7 +226,7 @@ class SpockTest extends CiVisibilityInstrumentationTest { ListWriterAssert.assertTraces(TEST_WRITER, 4, true, new CiVisibilityTestUtils.SortTracesByType(), { trace(1) { span(0) { - spanType DDSpanTypes.TEST_SESSION_END + spanType DDSpanTypes.TEST tags(false) { arePresent(presentTags) areNotPresent(notPresentTags) diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy b/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy index ebb593965b1..e2c2f123fbf 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy @@ -261,7 +261,7 @@ class JUnit5Test extends CiVisibilityInstrumentationTest { ListWriterAssert.assertTraces(TEST_WRITER, 4, true, new CiVisibilityTestUtils.SortTracesByType(), { trace(1) { span(0) { - spanType DDSpanTypes.TEST_SESSION_END + spanType DDSpanTypes.TEST tags(false) { arePresent(presentTags) areNotPresent(notPresentTags) diff --git a/dd-java-agent/instrumentation/karate/src/test/groovy/KarateTest.groovy b/dd-java-agent/instrumentation/karate/src/test/groovy/KarateTest.groovy index 8394a4ea957..d0ec581ad05 100644 --- a/dd-java-agent/instrumentation/karate/src/test/groovy/KarateTest.groovy +++ b/dd-java-agent/instrumentation/karate/src/test/groovy/KarateTest.groovy @@ -191,7 +191,7 @@ class KarateTest extends CiVisibilityInstrumentationTest { ListWriterAssert.assertTraces(TEST_WRITER, 5, true, new CiVisibilityTestUtils.SortTracesByType(), { trace(1) { span(0) { - spanType DDSpanTypes.TEST_SESSION_END + spanType DDSpanTypes.TEST tags(false) { arePresent(presentTags) areNotPresent(notPresentTags) diff --git a/dd-java-agent/instrumentation/scalatest/src/test/groovy/ScalatestTest.groovy b/dd-java-agent/instrumentation/scalatest/src/test/groovy/ScalatestTest.groovy index e45fa1c7999..465094a6a4b 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/groovy/ScalatestTest.groovy +++ b/dd-java-agent/instrumentation/scalatest/src/test/groovy/ScalatestTest.groovy @@ -192,7 +192,7 @@ class ScalatestTest extends CiVisibilityInstrumentationTest { ListWriterAssert.assertTraces(TEST_WRITER, 4, true, new CiVisibilityTestUtils.SortTracesByType(), { trace(1) { span(0) { - spanType DDSpanTypes.TEST_SESSION_END + spanType DDSpanTypes.TEST tags(false) { arePresent(presentTags) areNotPresent(notPresentTags) diff --git a/dd-java-agent/instrumentation/testng/src/testFixtures/groovy/datadog/trace/instrumentation/testng/TestNGTest.groovy b/dd-java-agent/instrumentation/testng/src/testFixtures/groovy/datadog/trace/instrumentation/testng/TestNGTest.groovy index 1621e7969bb..8454e0888e3 100644 --- a/dd-java-agent/instrumentation/testng/src/testFixtures/groovy/datadog/trace/instrumentation/testng/TestNGTest.groovy +++ b/dd-java-agent/instrumentation/testng/src/testFixtures/groovy/datadog/trace/instrumentation/testng/TestNGTest.groovy @@ -283,7 +283,7 @@ abstract class TestNGTest extends CiVisibilityInstrumentationTest { ListWriterAssert.assertTraces(TEST_WRITER, 4, true, new CiVisibilityTestUtils.SortTracesByType(), { trace(1) { span(0) { - spanType DDSpanTypes.TEST_SESSION_END + spanType DDSpanTypes.TEST tags(false) { arePresent(presentTags) areNotPresent(notPresentTags) diff --git a/dd-java-agent/instrumentation/weaver/src/test/groovy/WeaverTest.groovy b/dd-java-agent/instrumentation/weaver/src/test/groovy/WeaverTest.groovy index bef4d7838bd..e8f04776454 100644 --- a/dd-java-agent/instrumentation/weaver/src/test/groovy/WeaverTest.groovy +++ b/dd-java-agent/instrumentation/weaver/src/test/groovy/WeaverTest.groovy @@ -46,7 +46,7 @@ class WeaverTest extends CiVisibilityInstrumentationTest { ListWriterAssert.assertTraces(TEST_WRITER, 4, true, new CiVisibilityTestUtils.SortTracesByType(), { trace(1) { span(0) { - spanType DDSpanTypes.TEST_SESSION_END + spanType DDSpanTypes.TEST tags(false) { areNotPresent([ DDTags.LIBRARY_CAPABILITIES_TIA, 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 8d1bbd64c89..80821a8a9c0 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 @@ -191,13 +191,6 @@ "duration" : ${content_duration_6}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "true", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_6}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, 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 a7e5a3b029f..c60d70b9b19 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 @@ -139,13 +139,6 @@ "duration" : ${content_duration_5}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_5}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, 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 525ae412e53..2eff4d5848a 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 @@ -191,13 +191,6 @@ "duration" : ${content_duration_6}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_6}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-gradle-plugin-test/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-gradle-plugin-test/events.ftl index ab50889a89b..3462c439bd2 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-gradle-plugin-test/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-gradle-plugin-test/events.ftl @@ -185,14 +185,6 @@ "duration" : ${content_duration_6}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.fail_fast_test_order" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_6}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, 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 5f9f8e2f044..5807153d23d 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 @@ -187,14 +187,6 @@ "duration" : ${content_duration_6}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.fail_fast_test_order" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_6}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, 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 201719fee7a..e67352e1531 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 @@ -137,13 +137,6 @@ "duration" : ${content_duration_5}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_5}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, 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 82d5a711b9a..3357f857988 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 @@ -136,13 +136,6 @@ "duration" : ${content_duration_5}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_5}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -251,14 +244,6 @@ "duration" : ${content_duration_7}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.fail_fast_test_order" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, 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 009f7d85bd4..9d66aab6ad6 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 @@ -185,13 +185,6 @@ "duration" : ${content_duration_6}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_6}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -300,14 +293,6 @@ "duration" : ${content_duration_8}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.fail_fast_test_order" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, 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 4f3814f3dac..c9d9587c30f 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 @@ -95,13 +95,6 @@ "duration" : ${content_duration_3}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_3}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -150,13 +143,6 @@ "duration" : ${content_duration_4}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_4}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, 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 923758a03e6..a8d9cb20ab2 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 @@ -144,13 +144,6 @@ "duration" : ${content_duration_4}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_4}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -199,13 +192,6 @@ "duration" : ${content_duration_5}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_5}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, 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 9ff70a22e3e..460c9fe9d6c 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 @@ -187,13 +187,6 @@ "duration" : ${content_duration_6}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_6}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, 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 3c87f2ca64a..23d159025ef 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 @@ -137,13 +137,6 @@ "duration" : ${content_duration_5}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_5}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, 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 c9decf983cd..94e172a837f 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 @@ -257,13 +257,6 @@ "duration" : ${content_duration_8}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "true", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "false", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, 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 30c5b44c967..c4515a48f24 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 @@ -261,13 +261,6 @@ "duration" : ${content_duration_8}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, 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 b5f05732b11..f2646014b9d 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 @@ -225,13 +225,6 @@ "duration" : ${content_duration_7}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_impacted_tests/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_impacted_tests/events.ftl index d0294527fd6..7a4cb662146 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_impacted_tests/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_impacted_tests/events.ftl @@ -223,13 +223,6 @@ "duration" : ${content_duration_7}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, 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 415e5c1b1ef..a4006651801 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 @@ -281,13 +281,6 @@ "duration" : ${content_duration_9}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "false", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_9}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/events.ftl index 654a68d08a1..67ef45ed060 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/events.ftl @@ -261,14 +261,6 @@ "duration" : ${content_duration_8}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.fail_fast_test_order" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, 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 30c5b44c967..c4515a48f24 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 @@ -261,13 +261,6 @@ "duration" : ${content_duration_8}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, 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 30c5b44c967..c4515a48f24 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 @@ -261,13 +261,6 @@ "duration" : ${content_duration_8}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/events.ftl index f10096d024a..42cd14dc56e 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/events.ftl @@ -225,13 +225,6 @@ "duration" : ${content_duration_7}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "true", - "_dd.library_capabilities.test_management.disable" : "true", - "_dd.library_capabilities.test_management.quarantine" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -672,13 +665,6 @@ "duration" : ${content_duration_14}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "true", - "_dd.library_capabilities.test_management.disable" : "true", - "_dd.library_capabilities.test_management.quarantine" : "true", "_dd.p.tid" : ${content_meta__dd_p_tid_14}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, 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 9e13f85400a..3b1e2230da5 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 @@ -217,13 +217,6 @@ "duration" : ${content_duration_7}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "false", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, 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 5885f14fbf6..bc6b96c9fe9 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 @@ -318,12 +318,6 @@ "duration" : ${content_duration_10}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.test_impact_analysis" : "false", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_10}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, 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 d35ed072d26..521e50ac686 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 @@ -261,13 +261,6 @@ "duration" : ${content_duration_8}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, From 8f6e0d7eed4112bfc9d7728a70484ace8f192cc1 Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Tue, 4 Mar 2025 16:41:00 +0100 Subject: [PATCH 34/41] remove unused test name for execution strategy --- .../trace/civisibility/test/ExecutionStrategyTest.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/test/ExecutionStrategyTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/test/ExecutionStrategyTest.groovy index a412943df83..7b722d2698d 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/test/ExecutionStrategyTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/test/ExecutionStrategyTest.groovy @@ -109,7 +109,7 @@ class ExecutionStrategyTest extends Specification { policy.currentExecutionRetryReason() == RetryReason.attemptToFix } - def "test capabilities status: #testcaseName"() { + def "test capabilities status"() { setup: def testManagementSettings = Stub(TestManagementSettings) testManagementSettings.isEnabled() >> false From 2e9d18c05b50497c50d5a41bed66b556fb1f429f Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Wed, 5 Mar 2025 15:17:01 +0100 Subject: [PATCH 35/41] PR changes --- .../civisibility/CiVisibilitySystem.java | 13 ++- .../config/ExecutionSettings.java | 41 ++++++++ .../config/LibraryCapabilityUtils.java | 18 ++-- .../domain/TestFrameworkSession.java | 2 +- .../trace/civisibility/domain/TestImpl.java | 6 +- .../civisibility/domain/TestSuiteImpl.java | 3 +- .../domain/buildsystem/ProxyTestSession.java | 7 +- .../domain/headless/HeadlessTestSession.java | 7 +- .../domain/manualapi/ManualApiTestModule.java | 3 +- .../events/NoOpTestEventsHandler.java | 2 +- .../civisibility/test/ExecutionStrategy.java | 27 ------ .../config/ExecutionSettingsTest.groovy | 51 ++++++++++ .../civisibility/domain/TestImplTest.groovy | 11 +-- .../test/ExecutionStrategyTest.groovy | 32 ------- .../CiVisibilityInstrumentationTest.groovy | 27 +++++- .../civisibility/CiVisibilityTestUtils.groovy | 14 +-- .../instrumentation/junit4/CucumberUtils.java | 15 ++- .../junit4/JUnit4CucumberInstrumentation.java | 3 +- .../src/test/groovy/CucumberTest.groovy | 34 ++----- .../src/test/groovy/JUnit413Test.groovy | 3 +- .../junit4/MUnitInstrumentation.java | 2 +- .../instrumentation/junit4/MUnitUtils.java | 11 +++ .../src/test/groovy/MUnitTest.groovy | 35 +------ .../junit4/JUnit4Instrumentation.java | 2 +- .../instrumentation/junit4/JUnit4Utils.java | 52 ++--------- .../junit4/TestEventsHandlerHolder.java | 10 +- .../src/test/groovy/JUnit4Test.groovy | 37 +------- .../src/test/groovy/CucumberTest.groovy | 29 +----- .../src/test/groovy/JUnit58Test.groovy | 33 +------ .../src/test/groovy/SpockTest.groovy | 29 +----- .../junit5/JUnitPlatformUtils.java | 93 ++++++++++--------- .../junit5/TestEventsHandlerHolder.java | 2 +- .../src/test/groovy/JUnit5Test.groovy | 36 ++----- .../instrumentation/karate/KarateUtils.java | 31 ++++--- .../karate/TestEventsHandlerHolder.java | 5 +- .../karate/src/test/groovy/KarateTest.groovy | 39 +------- .../instrumentation/scalatest/RunContext.java | 15 +-- .../scalatest/ScalatestUtils.java | 13 +++ .../src/test/groovy/ScalatestTest.groovy | 34 +------ .../testng/TestEventsHandlerHolder.java | 5 +- .../instrumentation/testng/TestNGUtils.java | 2 +- .../instrumentation/testng/TestNGTest.groovy | 47 ++-------- .../weaver/DatadogWeaverReporter.java | 2 +- .../instrumentation/weaver/WeaverUtils.java | 6 +- .../weaver/src/test/groovy/WeaverTest.groovy | 24 +---- .../main/java/datadog/trace/api/DDTags.java | 16 ---- .../civisibility/InstrumentationBridge.java | 5 +- .../config/LibraryCapability.java | 26 ++++-- .../events/TestEventsHandler.java | 2 +- 49 files changed, 353 insertions(+), 609 deletions(-) diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilitySystem.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilitySystem.java index 4bcde858d17..5bc7e85c587 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilitySystem.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilitySystem.java @@ -170,10 +170,9 @@ public TestEventsHandler create( String component, @Nullable ContextStore suiteStore, @Nullable ContextStore testStore, - Collection availableCapabilities) { + Collection capabilities) { TestFrameworkSession testSession = - sessionFactory.startSession( - repoServices.moduleName, component, null, availableCapabilities); + sessionFactory.startSession(repoServices.moduleName, component, null, capabilities); TestFrameworkModule testModule = testSession.testModuleStart(repoServices.moduleName, null); return new TestEventsHandlerImpl<>( services.metricCollector, @@ -238,7 +237,7 @@ private static TestFrameworkSession.Factory childTestFrameworkSessionFactory( return (String projectName, String component, Long startTime, - Collection availableCapabilities) -> { + Collection capabilities) -> { String sessionName = services.config.getCiVisibilitySessionName(); String testCommand = services.config.getCiVisibilityTestCommand(); TestDecorator testDecorator = @@ -263,7 +262,7 @@ private static TestFrameworkSession.Factory childTestFrameworkSessionFactory( coverageServices.coverageReporter, services.signalClientFactory, executionStrategy, - availableCapabilities); + capabilities); }; } @@ -275,7 +274,7 @@ private static TestFrameworkSession.Factory headlessTestFrameworkSessionFactory( return (String projectName, String component, Long startTime, - Collection availableCapabilities) -> { + Collection capabilities) -> { repoServices.gitDataUploader.startOrObserveGitDataUpload(); String sessionName = services.config.getCiVisibilitySessionName(); @@ -300,7 +299,7 @@ private static TestFrameworkSession.Factory headlessTestFrameworkSessionFactory( services.linesResolver, coverageServices.coverageStoreFactory, executionStrategy, - availableCapabilities); + capabilities); }; } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettings.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettings.java index 4d93dcf5d38..cdca5314c6e 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettings.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettings.java @@ -1,5 +1,8 @@ package datadog.trace.civisibility.config; +import datadog.trace.api.Config; +import datadog.trace.api.civisibility.CIConstants; +import datadog.trace.api.civisibility.config.LibraryCapability; import datadog.trace.api.civisibility.config.TestFQN; import datadog.trace.api.civisibility.config.TestIdentifier; import datadog.trace.api.civisibility.config.TestMetadata; @@ -229,6 +232,44 @@ public Diff getPullRequestDiff() { return pullRequestDiff; } + @Nonnull + public Map getCapabilitiesStatus( + Collection capabilities) { + Map status = new EnumMap<>(LibraryCapability.class); + + for (LibraryCapability c : capabilities) { + switch (c) { + case TIA: + status.put(c, isTestSkippingEnabled()); + break; + case EFD: + EarlyFlakeDetectionSettings efdSettings = getEarlyFlakeDetectionSettings(); + status.put(c, efdSettings.isEnabled()); + break; + case ATR: + status.put(c, isFlakyTestRetriesEnabled()); + break; + case IMPACTED: + status.put(c, isImpactedTestsDetectionEnabled()); + break; + case FAIL_FAST: + String testOrder = Config.get().getCiVisibilityTestOrder(); + status.put(c, CIConstants.FAIL_FAST_TEST_ORDER.equalsIgnoreCase(testOrder)); + break; + case QUARANTINE: + case DISABLED: + case ATTEMPT_TO_FIX: + TestManagementSettings testManagementSettings = getTestManagementSettings(); + status.put(c, testManagementSettings.isEnabled()); + break; + default: + break; + } + } + + return status; + } + @Override public boolean equals(Object o) { if (this == o) { diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/LibraryCapabilityUtils.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/LibraryCapabilityUtils.java index bef9cf723ca..053a2ec9499 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/LibraryCapabilityUtils.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/LibraryCapabilityUtils.java @@ -1,6 +1,5 @@ package datadog.trace.civisibility.config; -import datadog.trace.api.DDTags; import datadog.trace.api.civisibility.config.LibraryCapability; import java.util.Collection; import java.util.EnumMap; @@ -13,16 +12,15 @@ public abstract class LibraryCapabilityUtils { private static Map capabilitiesTagMap() { Map capabilitiesTags = new EnumMap<>(LibraryCapability.class); - capabilitiesTags.put(LibraryCapability.TIA, DDTags.LIBRARY_CAPABILITIES_TIA); - capabilitiesTags.put(LibraryCapability.EFD, DDTags.LIBRARY_CAPABILITIES_EFD); - capabilitiesTags.put(LibraryCapability.ATR, DDTags.LIBRARY_CAPABILITIES_ATR); - capabilitiesTags.put(LibraryCapability.IMPACTED, DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS); + capabilitiesTags.put(LibraryCapability.TIA, LibraryCapability.TIA.asTag()); + capabilitiesTags.put(LibraryCapability.EFD, LibraryCapability.EFD.asTag()); + capabilitiesTags.put(LibraryCapability.ATR, LibraryCapability.ATR.asTag()); + capabilitiesTags.put(LibraryCapability.IMPACTED, LibraryCapability.IMPACTED.asTag()); + capabilitiesTags.put(LibraryCapability.FAIL_FAST, LibraryCapability.FAIL_FAST.asTag()); + capabilitiesTags.put(LibraryCapability.QUARANTINE, LibraryCapability.QUARANTINE.asTag()); + capabilitiesTags.put(LibraryCapability.DISABLED, LibraryCapability.DISABLED.asTag()); capabilitiesTags.put( - LibraryCapability.FAIL_FAST, DDTags.LIBRARY_CAPABILITIES_FAIL_FAST_TEST_ORDER); - capabilitiesTags.put(LibraryCapability.QUARANTINE, DDTags.LIBRARY_CAPABILITIES_QUARANTINE); - capabilitiesTags.put(LibraryCapability.DISABLED, DDTags.LIBRARY_CAPABILITIES_DISABLED); - capabilitiesTags.put( - LibraryCapability.ATTEMPT_TO_FIX, DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX); + LibraryCapability.ATTEMPT_TO_FIX, LibraryCapability.ATTEMPT_TO_FIX.asTag()); return capabilitiesTags; } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestFrameworkSession.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestFrameworkSession.java index b1f398fc4a0..c7391f945b6 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestFrameworkSession.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestFrameworkSession.java @@ -15,6 +15,6 @@ TestFrameworkSession startSession( String projectName, String component, Long startTime, - Collection availableCapabilities); + Collection capabilities); } } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java index 8a4fd7af037..0cd56757009 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java @@ -38,7 +38,6 @@ import datadog.trace.bootstrap.instrumentation.api.TagContext; import datadog.trace.bootstrap.instrumentation.api.Tags; import datadog.trace.civisibility.codeowners.Codeowners; -import datadog.trace.civisibility.config.LibraryCapabilityUtils; import datadog.trace.civisibility.decorator.TestDecorator; import datadog.trace.civisibility.source.LinesResolver; import datadog.trace.civisibility.source.SourcePathResolver; @@ -89,7 +88,7 @@ public TestImpl( Codeowners codeowners, CoverageStore.Factory coverageStoreFactory, ExecutionResults executionResults, - Map libraryCapabilities, + @Nonnull Map libraryCapabilities, Consumer onSpanFinish) { this.instrumentation = instrumentation; this.metricCollector = metricCollector; @@ -149,8 +148,7 @@ public TestImpl( } for (Map.Entry entry : libraryCapabilities.entrySet()) { - String capabilityTag = LibraryCapabilityUtils.CAPABILITY_TAG_MAP.get(entry.getKey()); - span.setTag(capabilityTag, entry.getValue()); + span.setTag(entry.getKey().asTag(), entry.getValue()); } testDecorator.afterStart(span); diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java index 308022d195d..bf154912f11 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java @@ -29,6 +29,7 @@ import java.util.Collection; import java.util.Map; import java.util.function.Consumer; +import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -75,7 +76,7 @@ public TestSuiteImpl( LinesResolver linesResolver, CoverageStore.Factory coverageStoreFactory, ExecutionResults executionResults, - Map libraryCapabilities, + @Nonnull Map libraryCapabilities, Consumer onSpanFinish) { this.moduleSpanContext = moduleSpanContext; this.moduleName = moduleName; diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestSession.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestSession.java index 651d13597b1..a44dc030bbf 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestSession.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestSession.java @@ -7,7 +7,6 @@ import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.civisibility.codeowners.Codeowners; -import datadog.trace.civisibility.config.LibraryCapabilityUtils; import datadog.trace.civisibility.coverage.percentage.child.ChildProcessCoverageReporter; import datadog.trace.civisibility.decorator.TestDecorator; import datadog.trace.civisibility.domain.TestFrameworkModule; @@ -18,6 +17,7 @@ import datadog.trace.civisibility.test.ExecutionStrategy; import java.util.Collection; import java.util.Map; +import javax.annotation.Nonnull; import javax.annotation.Nullable; /** @@ -52,7 +52,7 @@ public ProxyTestSession( ChildProcessCoverageReporter childProcessCoverageReporter, SignalClient.Factory signalClientFactory, ExecutionStrategy executionStrategy, - Collection availableCapabilities) { + @Nonnull Collection capabilities) { this.parentProcessModuleContext = parentProcessModuleContext; this.config = config; this.metricCollector = metricCollector; @@ -65,8 +65,7 @@ public ProxyTestSession( this.signalClientFactory = signalClientFactory; this.executionStrategy = executionStrategy; this.libraryCapabilities = - LibraryCapabilityUtils.filterCapabilities( - availableCapabilities, executionStrategy.getCapabilitiesStatus()); + executionStrategy.getExecutionSettings().getCapabilitiesStatus(capabilities); } @Override diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java index 906eda68627..7d43d8db71c 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java @@ -12,7 +12,6 @@ import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.Tags; import datadog.trace.civisibility.codeowners.Codeowners; -import datadog.trace.civisibility.config.LibraryCapabilityUtils; import datadog.trace.civisibility.decorator.TestDecorator; import datadog.trace.civisibility.domain.AbstractTestSession; import datadog.trace.civisibility.domain.InstrumentationType; @@ -24,6 +23,7 @@ import java.util.Collection; import java.util.Collections; import java.util.Map; +import javax.annotation.Nonnull; import javax.annotation.Nullable; /** @@ -51,7 +51,7 @@ public HeadlessTestSession( LinesResolver linesResolver, CoverageStore.Factory coverageStoreFactory, ExecutionStrategy executionStrategy, - Collection availableCapabilities) { + @Nonnull Collection capabilities) { super( projectName, startTime, @@ -66,8 +66,7 @@ public HeadlessTestSession( this.executionStrategy = executionStrategy; this.coverageStoreFactory = coverageStoreFactory; this.libraryCapabilities = - LibraryCapabilityUtils.filterCapabilities( - availableCapabilities, executionStrategy.getCapabilitiesStatus()); + executionStrategy.getExecutionSettings().getCapabilitiesStatus(capabilities); } @Override diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java index 382d1d9d4ff..125cff485aa 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java @@ -16,6 +16,7 @@ import datadog.trace.civisibility.source.SourcePathResolver; import datadog.trace.civisibility.test.ExecutionResults; import datadog.trace.civisibility.utils.SpanUtils; +import java.util.Collections; import java.util.function.Consumer; import javax.annotation.Nullable; @@ -79,7 +80,7 @@ public TestSuiteImpl testSuiteStart( linesResolver, coverageStoreFactory, executionResults, - null, + Collections.EMPTY_MAP, SpanUtils.propagateCiVisibilityTagsTo(span)); } } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/NoOpTestEventsHandler.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/NoOpTestEventsHandler.java index 26d0ddbd477..2f59377be5d 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/NoOpTestEventsHandler.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/NoOpTestEventsHandler.java @@ -132,7 +132,7 @@ public TestEventsHandler create( String component, @Nullable ContextStore suiteStore, @Nullable ContextStore testStore, - Collection availableCapabilities) { + Collection capabilities) { return new NoOpTestEventsHandler<>(); } } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionStrategy.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionStrategy.java index 02a0c36f6bb..334428e6c59 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionStrategy.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionStrategy.java @@ -1,8 +1,6 @@ package datadog.trace.civisibility.test; import datadog.trace.api.Config; -import datadog.trace.api.civisibility.CIConstants; -import datadog.trace.api.civisibility.config.LibraryCapability; import datadog.trace.api.civisibility.config.TestIdentifier; import datadog.trace.api.civisibility.config.TestMetadata; import datadog.trace.api.civisibility.config.TestSourceData; @@ -20,7 +18,6 @@ import datadog.trace.civisibility.source.LinesResolver; import datadog.trace.civisibility.source.SourcePathResolver; import java.lang.reflect.Method; -import java.util.EnumMap; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; import javax.annotation.Nonnull; @@ -223,30 +220,6 @@ private LinesResolver.Lines getLines(Method testMethod) { } } - public Map getCapabilitiesStatus() { - Map capabilities = new EnumMap<>(LibraryCapability.class); - - capabilities.put(LibraryCapability.TIA, executionSettings.isTestSkippingEnabled()); - - EarlyFlakeDetectionSettings efdSettings = executionSettings.getEarlyFlakeDetectionSettings(); - capabilities.put(LibraryCapability.EFD, efdSettings.isEnabled()); - - capabilities.put(LibraryCapability.ATR, executionSettings.isFlakyTestRetriesEnabled()); - capabilities.put( - LibraryCapability.IMPACTED, executionSettings.isImpactedTestsDetectionEnabled()); - - String testOrder = Config.get().getCiVisibilityTestOrder(); - capabilities.put( - LibraryCapability.FAIL_FAST, CIConstants.FAIL_FAST_TEST_ORDER.equalsIgnoreCase(testOrder)); - - TestManagementSettings testManagementSettings = executionSettings.getTestManagementSettings(); - capabilities.put(LibraryCapability.QUARANTINE, testManagementSettings.isEnabled()); - capabilities.put(LibraryCapability.DISABLED, testManagementSettings.isEnabled()); - capabilities.put(LibraryCapability.ATTEMPT_TO_FIX, testManagementSettings.isEnabled()); - - return capabilities; - } - /** * Returns the priority of the test execution that can be used for ordering tests. The higher the * value, the higher the priority, meaning that the test should be executed earlier. diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/ExecutionSettingsTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/ExecutionSettingsTest.groovy index 2bcbf3f8177..b4406e99c09 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/ExecutionSettingsTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/ExecutionSettingsTest.groovy @@ -1,11 +1,18 @@ package datadog.trace.civisibility.config +import datadog.trace.api.Config +import datadog.trace.api.civisibility.CIConstants +import datadog.trace.api.civisibility.config.LibraryCapability import datadog.trace.api.civisibility.config.TestFQN import datadog.trace.api.civisibility.config.TestIdentifier import datadog.trace.api.civisibility.config.TestMetadata +import datadog.trace.civisibility.diff.Diff import datadog.trace.civisibility.diff.LineDiff +import datadog.trace.civisibility.diff.LineDiffTest import spock.lang.Specification +import java.util.stream.Collectors + import static datadog.trace.civisibility.TestUtils.lines class ExecutionSettingsTest extends Specification { @@ -104,4 +111,48 @@ class ExecutionSettingsTest extends Specification { ), ] } + + def "test capabilities status: #testcaseName"() { + when: + def executionSettings = givenExecutionSettings(settingsEnabled) + + def capabilitiesStatus = executionSettings.getCapabilitiesStatus(capabilities) + def expectedStatus = capabilities.stream().collect(Collectors.toMap(item -> item, item -> settingsEnabled)) + + then: + capabilitiesStatus == expectedStatus + + where: + testcaseName | settingsEnabled | capabilities + "capabilities-disabled" | false | LibraryCapability.values().toList() + "capabilities-enabled" | true | LibraryCapability.values().toList() + "capabilities-filtering" | true | [LibraryCapability.TIA, LibraryCapability.ATR, LibraryCapability.IMPACTED, LibraryCapability.QUARANTINE] + } + + private ExecutionSettings givenExecutionSettings(boolean settingsEnabled) { + def testManagementSettings = Stub(TestManagementSettings) + testManagementSettings.isEnabled() >> settingsEnabled + + def earlyFlakeDetectionSettings = Stub(EarlyFlakeDetectionSettings) + earlyFlakeDetectionSettings.isEnabled() >> settingsEnabled + + return new ExecutionSettings( + settingsEnabled, + settingsEnabled, + settingsEnabled, + settingsEnabled, + settingsEnabled, + earlyFlakeDetectionSettings, + testManagementSettings, + null, + [:], + [:], + [], + [], + [], + [], + [], + LineDiff.EMPTY + ) + } } diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy index 96903b8d8d0..a520ee5e5b1 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy @@ -3,7 +3,6 @@ package datadog.trace.civisibility.domain import datadog.trace.agent.test.asserts.ListWriterAssert import datadog.trace.api.Config import datadog.trace.api.DDSpanTypes -import datadog.trace.api.DDTags import datadog.trace.api.DDTraceId import datadog.trace.api.civisibility.config.LibraryCapability import datadog.trace.api.civisibility.config.TestIdentifier @@ -36,11 +35,11 @@ class TestImplTest extends SpanWriterTest { parent() spanType DDSpanTypes.TEST tags(false) { - "$DDTags.LIBRARY_CAPABILITIES_TIA" true - "$DDTags.LIBRARY_CAPABILITIES_EFD" false - "$DDTags.LIBRARY_CAPABILITIES_QUARANTINE" true - "$DDTags.LIBRARY_CAPABILITIES_DISABLED" false - "$DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX" true + "$LibraryCapability.TIA.asTag()" true + "$LibraryCapability.EFD.asTag()" false + "$LibraryCapability.QUARANTINE.asTag()" true + "$LibraryCapability.DISABLED.asTag()" false + "$LibraryCapability.ATTEMPT_TO_FIX.asTag()" true } } } diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/test/ExecutionStrategyTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/test/ExecutionStrategyTest.groovy index 7b722d2698d..952f816110f 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/test/ExecutionStrategyTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/test/ExecutionStrategyTest.groovy @@ -1,7 +1,6 @@ package datadog.trace.civisibility.test import datadog.trace.api.Config -import datadog.trace.api.civisibility.config.LibraryCapability import datadog.trace.api.civisibility.config.TestFQN import datadog.trace.api.civisibility.config.TestIdentifier import datadog.trace.api.civisibility.config.TestMetadata @@ -109,37 +108,6 @@ class ExecutionStrategyTest extends Specification { policy.currentExecutionRetryReason() == RetryReason.attemptToFix } - def "test capabilities status"() { - setup: - def testManagementSettings = Stub(TestManagementSettings) - testManagementSettings.isEnabled() >> false - - def earlyFlakeDetectionSettings = Stub(EarlyFlakeDetectionSettings) - earlyFlakeDetectionSettings.isEnabled() >> true - - def executionSettings = Stub(ExecutionSettings) - executionSettings.getTestManagementSettings() >> testManagementSettings - executionSettings.getEarlyFlakeDetectionSettings() >> earlyFlakeDetectionSettings - executionSettings.isFlakyTestRetriesEnabled() >> true - executionSettings.isImpactedTestsDetectionEnabled() >> true - - def strategy = givenAnExecutionStrategy(executionSettings) - def capabilitiesStatus = strategy.getCapabilitiesStatus() - - expect: - capabilitiesStatus.keySet() == new HashSet<>(LibraryCapability.values().toList()) - capabilitiesStatus == [ - (LibraryCapability.TIA) : false, - (LibraryCapability.EFD) : true, - (LibraryCapability.ATR) : true, - (LibraryCapability.IMPACTED) : true, - (LibraryCapability.FAIL_FAST) : false, - (LibraryCapability.QUARANTINE) : false, - (LibraryCapability.DISABLED) : false, - (LibraryCapability.ATTEMPT_TO_FIX): false, - ] - } - private ExecutionStrategy givenAnExecutionStrategy(ExecutionSettings executionSettings = ExecutionSettings.EMPTY) { def config = Config.get() def resolver = Stub(SourcePathResolver) diff --git a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy index 22bd30da0c7..f214254eed1 100644 --- a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy @@ -4,7 +4,9 @@ import com.fasterxml.jackson.databind.ObjectMapper import datadog.communication.serialization.GrowableBuffer import datadog.communication.serialization.msgpack.MsgPackWriter import datadog.trace.agent.test.AgentTestRunner +import datadog.trace.agent.test.asserts.ListWriterAssert import datadog.trace.api.Config +import datadog.trace.api.DDSpanTypes import datadog.trace.api.civisibility.CIConstants import datadog.trace.api.civisibility.DDTest import datadog.trace.api.civisibility.DDTestSuite @@ -57,6 +59,7 @@ import java.nio.file.Path import java.nio.file.Paths import java.util.concurrent.TimeUnit import java.util.function.Predicate +import java.util.stream.Collectors abstract class CiVisibilityInstrumentationTest extends AgentTestRunner { @@ -137,7 +140,7 @@ abstract class CiVisibilityInstrumentationTest extends AgentTestRunner { def executionSettingsFactory = new MockExecutionSettingsFactory(settings) def coverageStoreFactory = new FileCoverageStore.Factory(metricCollector, sourcePathResolver) - TestFrameworkSession.Factory testFrameworkSessionFactory = (String projectName, String component, Long startTime, Collection availableCapabilities) -> { + TestFrameworkSession.Factory testFrameworkSessionFactory = (String projectName, String component, Long startTime, Collection capabilities) -> { def config = Config.get() def ciTags = [(DUMMY_CI_TAG): DUMMY_CI_TAG_VALUE] TestDecorator testDecorator = new TestDecoratorImpl(component, "session-name", "test-command", ciTags) @@ -157,7 +160,7 @@ abstract class CiVisibilityInstrumentationTest extends AgentTestRunner { executionSettingsFactory.create(JvmInfo.CURRENT_JVM, ""), sourcePathResolver, linesResolver), - availableCapabilities + capabilities ) } @@ -256,8 +259,8 @@ abstract class CiVisibilityInstrumentationTest extends AgentTestRunner { } @Override - TestEventsHandler create(String component, ContextStore suiteStore, ContextStore testStore, Collection availableCapabilities) { - TestFrameworkSession testSession = testFrameworkSessionFactory.startSession(moduleName, component, null, availableCapabilities) + TestEventsHandler create(String component, ContextStore suiteStore, ContextStore testStore, Collection capabilities) { + TestFrameworkSession testSession = testFrameworkSessionFactory.startSession(moduleName, component, null, capabilities) TestFrameworkModule testModule = testSession.testModuleStart(moduleName, null) new TestEventsHandlerImpl(metricCollector, testSession, testModule, suiteStore != null ? suiteStore : new ConcurrentHashMapContextStore<>(), @@ -383,6 +386,22 @@ abstract class CiVisibilityInstrumentationTest extends AgentTestRunner { return true } + def assertCapabilities(Collection capabilities, int expectedTraceCount) { + ListWriterAssert.assertTraces(TEST_WRITER, expectedTraceCount, true, new CiVisibilityTestUtils.SortTracesByType(), { + trace(1) { + span(0) { + spanType DDSpanTypes.TEST + tags(false) { + arePresent(capabilities.stream().map(LibraryCapability::asTag).collect(Collectors.toList())) + areNotPresent(LibraryCapability.values().stream().filter(capability -> !capabilities.contains(capability)).map(LibraryCapability::asTag).collect(Collectors.toList())) + } + } + } + }) + + return true + } + def getTestIdentifiers(List events) { events.sort(Comparator.comparing { it['content']['start'] as Long }) def testIdentifiers = [] diff --git a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityTestUtils.groovy b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityTestUtils.groovy index ea06b4e07cc..b07295bc4c4 100644 --- a/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityTestUtils.groovy +++ b/dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityTestUtils.groovy @@ -8,7 +8,7 @@ import com.jayway.jsonpath.Option import com.jayway.jsonpath.ReadContext import com.jayway.jsonpath.WriteContext import datadog.trace.api.DDSpanTypes -import datadog.trace.api.DDTags +import datadog.trace.api.civisibility.config.LibraryCapability import datadog.trace.core.DDSpan import freemarker.core.Environment import freemarker.core.InvalidReferenceException @@ -21,6 +21,7 @@ import org.skyscreamer.jsonassert.JSONCompareMode import java.nio.file.Files import java.nio.file.Paths import java.util.regex.Pattern +import java.util.stream.Collectors abstract class CiVisibilityTestUtils { @@ -53,16 +54,7 @@ abstract class CiVisibilityTestUtils { ] // ignored tags on assertion and fixture build - static final List IGNORED_TAGS = [ - "content.meta.['$DDTags.LIBRARY_CAPABILITIES_TIA']", - "content.meta.['$DDTags.LIBRARY_CAPABILITIES_EFD']", - "content.meta.['$DDTags.LIBRARY_CAPABILITIES_ATR']", - "content.meta.['$DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS']", - "content.meta.['$DDTags.LIBRARY_CAPABILITIES_FAIL_FAST_TEST_ORDER']", - "content.meta.['$DDTags.LIBRARY_CAPABILITIES_QUARANTINE']", - "content.meta.['$DDTags.LIBRARY_CAPABILITIES_DISABLED']", - "content.meta.['$DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX']", - ] + static final List IGNORED_TAGS = LibraryCapability.values().toList().stream().map(c -> "content.meta.['${c.asTag()}']").collect(Collectors.toList()) static final List COVERAGE_DYNAMIC_PATHS = [path("test_session_id"), path("test_suite_id"), path("span_id"),] diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/CucumberUtils.java b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/CucumberUtils.java index 12b77e363fa..5f8b1f99435 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/CucumberUtils.java +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/CucumberUtils.java @@ -1,6 +1,7 @@ package datadog.trace.instrumentation.junit4; import datadog.trace.agent.tooling.muzzle.Reference; +import datadog.trace.api.civisibility.config.LibraryCapability; import datadog.trace.api.civisibility.config.TestIdentifier; import datadog.trace.api.civisibility.events.TestDescriptor; import datadog.trace.api.civisibility.events.TestSuiteDescriptor; @@ -12,6 +13,7 @@ import java.io.InputStream; import java.lang.invoke.MethodHandle; import java.net.URI; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -55,12 +57,21 @@ public static String getVersion() { private static final MethodHandle PICKLE_RUNNER_GET_DESCRIPTION = REFLECTION.method("io.cucumber.junit.PickleRunners$PickleRunner", "getDescription"); + public static final List CAPABILITIES = + Arrays.asList( + LibraryCapability.TIA, + LibraryCapability.ATR, + LibraryCapability.EFD, + LibraryCapability.QUARANTINE, + LibraryCapability.DISABLED, + LibraryCapability.ATTEMPT_TO_FIX); + private CucumberUtils() {} public static Map getPicklesById(List> featureRunners) { Map pickleById = new HashMap<>(); for (ParentRunner featureRunner : featureRunners) { - Feature feature = (Feature) REFLECTION.invoke(FEATURE_GETTER, featureRunner); + Feature feature = REFLECTION.invoke(FEATURE_GETTER, featureRunner); for (Pickle pickle : feature.getPickles()) { Object pickleId = REFLECTION.invoke(PICKLE_ID_CONSTRUCTOR, pickle); pickleById.put(pickleId, pickle); @@ -118,7 +129,7 @@ public static String getTestNameForScenario(Description scenarioDescription) { Integer pickleLine = getPickleLine(scenarioDescription); if (pickleLine != null) { - return "LINE:" + pickleLine + ""; + return "LINE:" + pickleLine; } return "EMPTY_NAME"; diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberInstrumentation.java b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberInstrumentation.java index 0ba9205314c..9237af9e6a7 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/JUnit4CucumberInstrumentation.java @@ -83,7 +83,8 @@ public static void addTracingListener( } } - TestEventsHandlerHolder.start(TestFrameworkInstrumentation.CUCUMBER); + TestEventsHandlerHolder.start( + TestFrameworkInstrumentation.CUCUMBER, CucumberUtils.CAPABILITIES); replacedNotifier.addListener( new CucumberTracingListener( diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy index 40ca18f2524..db06f8732e9 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy @@ -1,7 +1,7 @@ import datadog.trace.agent.test.asserts.ListWriterAssert import datadog.trace.api.DDSpanTypes -import datadog.trace.api.DDTags import datadog.trace.api.DisableTestTrace +import datadog.trace.api.civisibility.config.LibraryCapability import datadog.trace.api.civisibility.config.TestFQN import datadog.trace.api.civisibility.config.TestIdentifier import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation @@ -9,10 +9,10 @@ import datadog.trace.civisibility.CiVisibilityInstrumentationTest import datadog.trace.civisibility.CiVisibilityTestUtils import datadog.trace.civisibility.config.LibraryCapabilityUtils import datadog.trace.instrumentation.junit4.CucumberTracingListener +import datadog.trace.instrumentation.junit4.CucumberUtils import datadog.trace.instrumentation.junit4.TestEventsHandlerHolder import io.cucumber.core.options.Constants import org.example.cucumber.TestSucceedCucumber -import org.junit.jupiter.api.Assumptions import org.junit.runner.JUnitCore import java.util.stream.Collectors @@ -208,33 +208,11 @@ class CucumberTest extends CiVisibilityInstrumentationTest { } def "test capabilities tagging #testcaseName"() { - def notPresentTags = new HashSet<>(LibraryCapabilityUtils.CAPABILITY_TAG_MAP.values()) - notPresentTags.removeAll(presentTags) - + setup: runFeatures(["org/example/cucumber/calculator/basic_arithmetic.feature"], true) - ListWriterAssert.assertTraces(TEST_WRITER, 4, true, new CiVisibilityTestUtils.SortTracesByType(), { - trace(1) { - span(0) { - spanType DDSpanTypes.TEST - tags(false) { - arePresent(presentTags) - areNotPresent(notPresentTags) - } - } - } - }) - - where: - testcaseName | presentTags - "test-capabilities-base" | [ - DDTags.LIBRARY_CAPABILITIES_TIA, - DDTags.LIBRARY_CAPABILITIES_ATR, - DDTags.LIBRARY_CAPABILITIES_EFD, - DDTags.LIBRARY_CAPABILITIES_QUARANTINE, - DDTags.LIBRARY_CAPABILITIES_DISABLED, - DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX - ] + expect: + assertCapabilities(CucumberUtils.CAPABILITIES, 4) } private String version() { @@ -248,7 +226,7 @@ class CucumberTest extends CiVisibilityInstrumentationTest { .map(f -> "classpath:" + f). collect(Collectors.joining(","))) - TestEventsHandlerHolder.start(TestFrameworkInstrumentation.CUCUMBER) + TestEventsHandlerHolder.start(TestFrameworkInstrumentation.CUCUMBER, CucumberUtils.CAPABILITIES) try { def result = runner.run(TestSucceedCucumber) if (expectSuccess) { diff --git a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/groovy/JUnit413Test.groovy b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/groovy/JUnit413Test.groovy index 5f400d721ff..ed5a06b4ab9 100644 --- a/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/groovy/JUnit413Test.groovy +++ b/dd-java-agent/instrumentation/junit-4.10/junit-4.13/src/test/groovy/JUnit413Test.groovy @@ -1,6 +1,7 @@ import datadog.trace.api.DisableTestTrace import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation import datadog.trace.civisibility.CiVisibilityInstrumentationTest +import datadog.trace.instrumentation.junit4.JUnit4Utils import datadog.trace.instrumentation.junit4.TestEventsHandlerHolder import junit.runner.Version import org.example.TestFailedAfter @@ -38,7 +39,7 @@ class JUnit413Test extends CiVisibilityInstrumentationTest { } private void runTests(Collection> tests, boolean expectSuccess = true) { - TestEventsHandlerHolder.start(TestFrameworkInstrumentation.JUNIT4) + TestEventsHandlerHolder.start(TestFrameworkInstrumentation.JUNIT4, JUnit4Utils.CAPABILITIES) try { Class[] array = tests.toArray(new Class[0]) def result = runner.run(array) diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitInstrumentation.java b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitInstrumentation.java index 9fe051f3c56..2ef32f48d12 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitInstrumentation.java +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitInstrumentation.java @@ -74,7 +74,7 @@ public static void addTracingListener( } } - TestEventsHandlerHolder.start(TestFrameworkInstrumentation.MUNIT); + TestEventsHandlerHolder.start(TestFrameworkInstrumentation.MUNIT, MUnitUtils.CAPABILITIES); replacedNotifier.addListener( new MUnitTracingListener( diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitUtils.java b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitUtils.java index 1f2bad85589..8038795dda5 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitUtils.java +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitUtils.java @@ -1,9 +1,12 @@ package datadog.trace.instrumentation.junit4; +import datadog.trace.api.civisibility.config.LibraryCapability; import datadog.trace.api.civisibility.events.TestDescriptor; import datadog.trace.api.civisibility.events.TestSuiteDescriptor; import datadog.trace.util.MethodHandles; import java.lang.invoke.MethodHandle; +import java.util.Arrays; +import java.util.List; import munit.MUnitRunner; import org.junit.runner.Description; @@ -16,6 +19,14 @@ public abstract class MUnitUtils { MUnitRunner.class, m -> "createTestDescription".equals(m.getName()) && m.getParameterCount() == 1); + public static final List CAPABILITIES = + Arrays.asList( + LibraryCapability.ATR, + LibraryCapability.EFD, + LibraryCapability.IMPACTED, + LibraryCapability.QUARANTINE, + LibraryCapability.ATTEMPT_TO_FIX); + private MUnitUtils() {} public static Description createDescription(MUnitRunner runner, Object test) { diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy index 8d21612de30..9149b4773a9 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy @@ -1,15 +1,11 @@ -import datadog.trace.agent.test.asserts.ListWriterAssert -import datadog.trace.api.DDSpanTypes -import datadog.trace.api.DDTags import datadog.trace.api.DisableTestTrace import datadog.trace.api.civisibility.config.TestFQN import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation import datadog.trace.civisibility.CiVisibilityInstrumentationTest -import datadog.trace.civisibility.CiVisibilityTestUtils -import datadog.trace.civisibility.config.LibraryCapabilityUtils import datadog.trace.civisibility.diff.FileDiff import datadog.trace.civisibility.diff.LineDiff import datadog.trace.instrumentation.junit4.MUnitTracingListener +import datadog.trace.instrumentation.junit4.MUnitUtils import datadog.trace.instrumentation.junit4.TestEventsHandlerHolder import org.example.TestFailedAssumptionMUnit import org.example.TestFailedMUnit @@ -150,36 +146,15 @@ class MUnitTest extends CiVisibilityInstrumentationTest { } def "test capabilities tagging #testcaseName"() { - def notPresentTags = new HashSet<>(LibraryCapabilityUtils.CAPABILITY_TAG_MAP.values()) - notPresentTags.removeAll(presentTags) - + setup: runTests([TestSucceedMUnit], true) - ListWriterAssert.assertTraces(TEST_WRITER, 4, true, new CiVisibilityTestUtils.SortTracesByType(), { - trace(1) { - span(0) { - spanType DDSpanTypes.TEST - tags(false) { - arePresent(presentTags) - areNotPresent(notPresentTags) - } - } - } - }) - - where: - testcaseName | presentTags - "test-capabilities-base" | [ - DDTags.LIBRARY_CAPABILITIES_ATR, - DDTags.LIBRARY_CAPABILITIES_EFD, - DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS, - DDTags.LIBRARY_CAPABILITIES_QUARANTINE, - DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX - ] + expect: + assertCapabilities(MUnitUtils.CAPABILITIES, 4) } private void runTests(Collection> tests, boolean expectSuccess = true) { - TestEventsHandlerHolder.start(TestFrameworkInstrumentation.MUNIT) + TestEventsHandlerHolder.start(TestFrameworkInstrumentation.MUNIT, MUnitUtils.CAPABILITIES) try { Class[] array = tests.toArray(new Class[0]) def result = runner.run(array) diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java index 99c07805562..02786479793 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java +++ b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Instrumentation.java @@ -115,7 +115,7 @@ public static void addTracingListener( } } - TestEventsHandlerHolder.start(TestFrameworkInstrumentation.JUNIT4); + TestEventsHandlerHolder.start(TestFrameworkInstrumentation.JUNIT4, JUnit4Utils.CAPABILITIES); final TracingListener tracingListener = new JUnit4TracingListener( diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Utils.java b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Utils.java index 8f36ee5a410..c2213e2fa13 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Utils.java +++ b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/JUnit4Utils.java @@ -8,7 +8,6 @@ import datadog.trace.api.civisibility.events.TestDescriptor; import datadog.trace.api.civisibility.events.TestSuiteDescriptor; import datadog.trace.api.civisibility.telemetry.tag.SkipReason; -import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation; import datadog.trace.util.MethodHandles; import java.lang.annotation.Annotation; import java.lang.invoke.MethodHandle; @@ -54,6 +53,16 @@ public abstract class JUnit4Utils { private static final MethodHandle DESCRIPTION_UNIQUE_ID = METHOD_HANDLES.privateFieldGetter(Description.class, "fUniqueId"); + public static final List CAPABILITIES = + Arrays.asList( + LibraryCapability.TIA, + LibraryCapability.ATR, + LibraryCapability.EFD, + LibraryCapability.IMPACTED, + LibraryCapability.QUARANTINE, + LibraryCapability.DISABLED, + LibraryCapability.ATTEMPT_TO_FIX); + private static MethodHandle accessListenersFieldInRunNotifier() { MethodHandle listeners = METHOD_HANDLES.privateFieldGetter(RunNotifier.class, "listeners"); if (listeners != null) { @@ -333,45 +342,4 @@ public static boolean isJUnitPlatformRunnerTest(Description description) { Object uniqueId = getUniqueId(description); return uniqueId != null && uniqueId.toString().contains("[engine:"); } - - private static List cucumberCapabilities() { - return Arrays.asList( - LibraryCapability.TIA, - LibraryCapability.ATR, - LibraryCapability.EFD, - LibraryCapability.QUARANTINE, - LibraryCapability.DISABLED, - LibraryCapability.ATTEMPT_TO_FIX); - } - - private static List munitCapabilities() { - return Arrays.asList( - LibraryCapability.ATR, - LibraryCapability.EFD, - LibraryCapability.IMPACTED, - LibraryCapability.QUARANTINE, - LibraryCapability.ATTEMPT_TO_FIX); - } - - private static List junitCapabilities() { - return Arrays.asList( - LibraryCapability.TIA, - LibraryCapability.ATR, - LibraryCapability.EFD, - LibraryCapability.IMPACTED, - LibraryCapability.QUARANTINE, - LibraryCapability.DISABLED, - LibraryCapability.ATTEMPT_TO_FIX); - } - - public static List availableCapabilities( - TestFrameworkInstrumentation framework) { - if (framework.equals(TestFrameworkInstrumentation.MUNIT)) { - return munitCapabilities(); - } else if (framework.equals(TestFrameworkInstrumentation.CUCUMBER)) { - return cucumberCapabilities(); - } else { - return junitCapabilities(); - } - } } diff --git a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TestEventsHandlerHolder.java b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TestEventsHandlerHolder.java index bf80e9296bd..fa3eacdf225 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TestEventsHandlerHolder.java +++ b/dd-java-agent/instrumentation/junit-4.10/src/main/java/datadog/trace/instrumentation/junit4/TestEventsHandlerHolder.java @@ -1,12 +1,14 @@ package datadog.trace.instrumentation.junit4; import datadog.trace.api.civisibility.InstrumentationBridge; +import datadog.trace.api.civisibility.config.LibraryCapability; import datadog.trace.api.civisibility.events.TestDescriptor; import datadog.trace.api.civisibility.events.TestEventsHandler; import datadog.trace.api.civisibility.events.TestSuiteDescriptor; import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation; import datadog.trace.util.AgentThreadFactory; import datadog.trace.util.ConcurrentEnumMap; +import java.util.Collection; import java.util.Map; public abstract class TestEventsHandlerHolder { @@ -25,16 +27,14 @@ public abstract class TestEventsHandlerHolder { false)); } - public static synchronized void start(TestFrameworkInstrumentation framework) { + public static synchronized void start( + TestFrameworkInstrumentation framework, Collection capabilities) { TestEventsHandler handler = HANDLERS.get(framework); if (handler == null) { HANDLERS.put( framework, InstrumentationBridge.createTestEventsHandler( - framework.name().toLowerCase(), - null, - null, - JUnit4Utils.availableCapabilities(framework))); + framework.name().toLowerCase(), null, null, capabilities)); } } diff --git a/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy b/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy index 2e68b26c52e..7023159241f 100644 --- a/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy +++ b/dd-java-agent/instrumentation/junit-4.10/src/test/groovy/JUnit4Test.groovy @@ -1,15 +1,11 @@ -import datadog.trace.agent.test.asserts.ListWriterAssert -import datadog.trace.api.DDSpanTypes -import datadog.trace.api.DDTags import datadog.trace.api.DisableTestTrace import datadog.trace.api.civisibility.config.TestFQN import datadog.trace.api.civisibility.config.TestIdentifier import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation import datadog.trace.civisibility.CiVisibilityInstrumentationTest -import datadog.trace.civisibility.CiVisibilityTestUtils -import datadog.trace.civisibility.config.LibraryCapabilityUtils import datadog.trace.civisibility.diff.FileDiff import datadog.trace.civisibility.diff.LineDiff +import datadog.trace.instrumentation.junit4.JUnit4Utils import datadog.trace.instrumentation.junit4.TestEventsHandlerHolder import junit.runner.Version import org.example.* @@ -212,38 +208,15 @@ class JUnit4Test extends CiVisibilityInstrumentationTest { } def "test capabilities tagging #testcaseName"() { - def notPresentTags = new HashSet<>(LibraryCapabilityUtils.CAPABILITY_TAG_MAP.values()) - notPresentTags.removeAll(presentTags) - + setup: runTests([TestSucceed], true) - ListWriterAssert.assertTraces(TEST_WRITER, 4, true, new CiVisibilityTestUtils.SortTracesByType(), { - trace(1) { - span(0) { - spanType DDSpanTypes.TEST - tags(false) { - arePresent(presentTags) - areNotPresent(notPresentTags) - } - } - } - }) - - where: - testcaseName | presentTags - "test-capabilities-base" | [ - DDTags.LIBRARY_CAPABILITIES_TIA, - DDTags.LIBRARY_CAPABILITIES_ATR, - DDTags.LIBRARY_CAPABILITIES_EFD, - DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS, - DDTags.LIBRARY_CAPABILITIES_QUARANTINE, - DDTags.LIBRARY_CAPABILITIES_DISABLED, - DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX - ] + expect: + assertCapabilities(JUnit4Utils.CAPABILITIES, 4) } private void runTests(Collection> tests, boolean expectSuccess = true) { - TestEventsHandlerHolder.start(TestFrameworkInstrumentation.JUNIT4) + TestEventsHandlerHolder.start(TestFrameworkInstrumentation.JUNIT4, JUnit4Utils.CAPABILITIES) try { Class[] array = tests.toArray(new Class[0]) def result = runner.run(array) diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy index 526717896d5..23feafbf8d4 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy @@ -7,6 +7,7 @@ import datadog.trace.api.civisibility.config.TestIdentifier import datadog.trace.civisibility.CiVisibilityInstrumentationTest import datadog.trace.civisibility.CiVisibilityTestUtils import datadog.trace.civisibility.config.LibraryCapabilityUtils +import datadog.trace.instrumentation.junit5.JUnitPlatformUtils import datadog.trace.instrumentation.junit5.TestEventsHandlerHolder import io.cucumber.core.api.TypeRegistry import io.cucumber.core.options.Constants @@ -216,33 +217,11 @@ class CucumberTest extends CiVisibilityInstrumentationTest { } def "test capabilities tagging #testcaseName"() { - def notPresentTags = new HashSet<>(LibraryCapabilityUtils.CAPABILITY_TAG_MAP.values()) - notPresentTags.removeAll(presentTags) - + setup: runFeatures(["org/example/cucumber/calculator/basic_arithmetic.feature"], false, true) - ListWriterAssert.assertTraces(TEST_WRITER, 4, true, new CiVisibilityTestUtils.SortTracesByType(), { - trace(1) { - span(0) { - spanType DDSpanTypes.TEST - tags(false) { - arePresent(presentTags) - areNotPresent(notPresentTags) - } - } - } - }) - - where: - testcaseName | presentTags - "test-capabilities-base" | [ - DDTags.LIBRARY_CAPABILITIES_TIA, - DDTags.LIBRARY_CAPABILITIES_ATR, - DDTags.LIBRARY_CAPABILITIES_EFD, - DDTags.LIBRARY_CAPABILITIES_QUARANTINE, - DDTags.LIBRARY_CAPABILITIES_DISABLED, - DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX - ] + expect: + assertCapabilities(JUnitPlatformUtils.CUCUMBER_CAPABILITIES, 4) } private String parameterizedTestNameSuffix() { diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy index 5b2f8f659fd..f322d3b8cd9 100644 --- a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy @@ -90,37 +90,12 @@ class JUnit58Test extends CiVisibilityInstrumentationTest { } def "test capabilities tagging #testcaseName"() { - Assumptions.assumeTrue(assumption) - - def notPresentTags = new HashSet<>(LibraryCapabilityUtils.CAPABILITY_TAG_MAP.values()) - notPresentTags.removeAll(presentTags) - + setup: + Assumptions.assumeTrue(JUnitPlatformUtils.isJunitTestOrderingSupported(instrumentedLibraryVersion())) runTests([TestSucceed], true) - ListWriterAssert.assertTraces(TEST_WRITER, 5, true, new CiVisibilityTestUtils.SortTracesByType(), { - trace(1) { - span(0) { - spanType DDSpanTypes.TEST - tags(false) { - arePresent(presentTags) - areNotPresent(notPresentTags) - } - } - } - }) - - where: - testcaseName | presentTags | assumption - "test-capabilities-ordering" | [ - DDTags.LIBRARY_CAPABILITIES_TIA, - DDTags.LIBRARY_CAPABILITIES_ATR, - DDTags.LIBRARY_CAPABILITIES_EFD, - DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS, - DDTags.LIBRARY_CAPABILITIES_QUARANTINE, - DDTags.LIBRARY_CAPABILITIES_DISABLED, - DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX, - DDTags.LIBRARY_CAPABILITIES_FAIL_FAST_TEST_ORDER - ] | JUnitPlatformUtils.isJunitTestOrderingSupported(instrumentedLibraryVersion()) + expect: + assertCapabilities(JUnitPlatformUtils.JUNIT_CAPABILITIES_ORDERING, 5) } private static void runTests(List> tests, boolean expectSuccess = true) { diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy index 5cd5b21c8d3..e58c1928a9b 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy @@ -218,34 +218,11 @@ class SpockTest extends CiVisibilityInstrumentationTest { } def "test capabilities tagging #testcaseName"() { - def notPresentTags = new HashSet<>(LibraryCapabilityUtils.CAPABILITY_TAG_MAP.values()) - notPresentTags.removeAll(presentTags) - + setup: runTests([TestSucceedSpock], true) - ListWriterAssert.assertTraces(TEST_WRITER, 4, true, new CiVisibilityTestUtils.SortTracesByType(), { - trace(1) { - span(0) { - spanType DDSpanTypes.TEST - tags(false) { - arePresent(presentTags) - areNotPresent(notPresentTags) - } - } - } - }) - - where: - testcaseName | presentTags - "test-capabilities-base" | [ - DDTags.LIBRARY_CAPABILITIES_TIA, - DDTags.LIBRARY_CAPABILITIES_ATR, - DDTags.LIBRARY_CAPABILITIES_EFD, - DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS, - DDTags.LIBRARY_CAPABILITIES_QUARANTINE, - DDTags.LIBRARY_CAPABILITIES_DISABLED, - DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX - ] + expect: + assertCapabilities(JUnitPlatformUtils.SPOCK_CAPABILITIES, 4) } private static void runTests(List> classes, boolean expectSuccess = true) { diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java index f227863cd4b..f6c46923080 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java +++ b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java @@ -13,7 +13,6 @@ import datadog.trace.util.MethodHandles; import java.lang.invoke.MethodHandle; import java.lang.reflect.Method; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.ListIterator; @@ -49,6 +48,46 @@ public abstract class JUnitPlatformUtils { public static final ComparableVersion junitV58 = new ComparableVersion("5.8"); + public static final List JUNIT_CAPABILITIES_BASE = + Arrays.asList( + LibraryCapability.TIA, + LibraryCapability.ATR, + LibraryCapability.EFD, + LibraryCapability.IMPACTED, + LibraryCapability.QUARANTINE, + LibraryCapability.DISABLED, + LibraryCapability.ATTEMPT_TO_FIX); + + public static final List JUNIT_CAPABILITIES_ORDERING = + Arrays.asList( + LibraryCapability.TIA, + LibraryCapability.ATR, + LibraryCapability.EFD, + LibraryCapability.IMPACTED, + LibraryCapability.QUARANTINE, + LibraryCapability.DISABLED, + LibraryCapability.ATTEMPT_TO_FIX, + LibraryCapability.FAIL_FAST); + + public static final List SPOCK_CAPABILITIES = + Arrays.asList( + LibraryCapability.TIA, + LibraryCapability.ATR, + LibraryCapability.EFD, + LibraryCapability.IMPACTED, + LibraryCapability.QUARANTINE, + LibraryCapability.DISABLED, + LibraryCapability.ATTEMPT_TO_FIX); + + public static final List CUCUMBER_CAPABILITIES = + Arrays.asList( + LibraryCapability.TIA, + LibraryCapability.ATR, + LibraryCapability.EFD, + LibraryCapability.QUARANTINE, + LibraryCapability.DISABLED, + LibraryCapability.ATTEMPT_TO_FIX); + private JUnitPlatformUtils() {} private static final MethodHandles METHOD_HANDLES = @@ -257,54 +296,18 @@ public static boolean isJunitTestOrderingSupported(String version) { return version != null && junitV58.compareTo(new ComparableVersion(version)) <= 0; } - private static List junitCapabilities(String version) { - List baseCapabilities = - new ArrayList<>( - Arrays.asList( - LibraryCapability.TIA, - LibraryCapability.ATR, - LibraryCapability.EFD, - LibraryCapability.IMPACTED, - LibraryCapability.QUARANTINE, - LibraryCapability.DISABLED, - LibraryCapability.ATTEMPT_TO_FIX)); - - if (isJunitTestOrderingSupported(version)) { - baseCapabilities.add(LibraryCapability.FAIL_FAST); - } - - return baseCapabilities; - } - - private static List spockCapabilities() { - return Arrays.asList( - LibraryCapability.TIA, - LibraryCapability.ATR, - LibraryCapability.EFD, - LibraryCapability.IMPACTED, - LibraryCapability.QUARANTINE, - LibraryCapability.DISABLED, - LibraryCapability.ATTEMPT_TO_FIX); - } - - private static List cucumberCapabilities() { - return Arrays.asList( - LibraryCapability.TIA, - LibraryCapability.ATR, - LibraryCapability.EFD, - LibraryCapability.QUARANTINE, - LibraryCapability.DISABLED, - LibraryCapability.ATTEMPT_TO_FIX); - } - - public static List availableCapabilities(TestEngine testEngine) { + public static List capabilities(TestEngine testEngine) { TestFrameworkInstrumentation framework = engineToFramework(testEngine); if (framework.equals(TestFrameworkInstrumentation.CUCUMBER)) { - return cucumberCapabilities(); + return CUCUMBER_CAPABILITIES; } else if (framework.equals(TestFrameworkInstrumentation.SPOCK)) { - return spockCapabilities(); + return SPOCK_CAPABILITIES; } else { - return junitCapabilities(getFrameworkVersion(testEngine)); + if (isJunitTestOrderingSupported(getFrameworkVersion(testEngine))) { + return JUNIT_CAPABILITIES_ORDERING; + } else { + return JUNIT_CAPABILITIES_BASE; + } } } } diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java index 9fd4154d4ef..a53e419e020 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java +++ b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/TestEventsHandlerHolder.java @@ -66,7 +66,7 @@ public static synchronized void start( framework.name().toLowerCase(), suiteStore, testStore, - JUnitPlatformUtils.availableCapabilities(testEngine)); + JUnitPlatformUtils.capabilities(testEngine)); HANDLERS.put(framework, handler); } } diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy b/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy index e2c2f123fbf..67adecb2a51 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/groovy/JUnit5Test.groovy @@ -1,12 +1,11 @@ import datadog.trace.agent.test.asserts.ListWriterAssert import datadog.trace.api.DDSpanTypes -import datadog.trace.api.DDTags import datadog.trace.api.DisableTestTrace +import datadog.trace.api.civisibility.config.LibraryCapability import datadog.trace.api.civisibility.config.TestFQN import datadog.trace.api.civisibility.config.TestIdentifier import datadog.trace.civisibility.CiVisibilityInstrumentationTest import datadog.trace.civisibility.CiVisibilityTestUtils -import datadog.trace.civisibility.config.LibraryCapabilityUtils import datadog.trace.civisibility.diff.FileDiff import datadog.trace.civisibility.diff.LineDiff import datadog.trace.instrumentation.junit5.JUnitPlatformUtils @@ -52,6 +51,7 @@ import org.junit.platform.launcher.core.LauncherFactory import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.CopyOnWriteArrayList +import java.util.stream.Collectors import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass @@ -251,36 +251,12 @@ class JUnit5Test extends CiVisibilityInstrumentationTest { } def "test capabilities tagging #testcaseName"() { - Assumptions.assumeTrue(assumption) - - def notPresentTags = new HashSet<>(LibraryCapabilityUtils.CAPABILITY_TAG_MAP.values()) - notPresentTags.removeAll(presentTags) - + setup: + Assumptions.assumeTrue(!JUnitPlatformUtils.isJunitTestOrderingSupported(instrumentedLibraryVersion())) runTests([TestSucceed], true) - ListWriterAssert.assertTraces(TEST_WRITER, 4, true, new CiVisibilityTestUtils.SortTracesByType(), { - trace(1) { - span(0) { - spanType DDSpanTypes.TEST - tags(false) { - arePresent(presentTags) - areNotPresent(notPresentTags) - } - } - } - }) - - where: - testcaseName | presentTags | assumption - "test-capabilities-base" | [ - DDTags.LIBRARY_CAPABILITIES_TIA, - DDTags.LIBRARY_CAPABILITIES_ATR, - DDTags.LIBRARY_CAPABILITIES_EFD, - DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS, - DDTags.LIBRARY_CAPABILITIES_QUARANTINE, - DDTags.LIBRARY_CAPABILITIES_DISABLED, - DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX - ] | !JUnitPlatformUtils.isJunitTestOrderingSupported(instrumentedLibraryVersion()) + expect: + assertCapabilities(JUnitPlatformUtils.JUNIT_CAPABILITIES_BASE, 4) } protected void runTests(List> tests, boolean expectSuccess = true) { diff --git a/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateUtils.java b/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateUtils.java index 77f2f340e43..3fc6348aa6e 100644 --- a/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateUtils.java +++ b/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/KarateUtils.java @@ -52,6 +52,22 @@ private KarateUtils() {} private static final ComparableVersion karateV12 = new ComparableVersion("1.2.0"); private static final ComparableVersion karateV13 = new ComparableVersion("1.3.0"); + public static final List CAPABILITIES_BASE = + Arrays.asList( + LibraryCapability.ATR, + LibraryCapability.EFD, + LibraryCapability.QUARANTINE, + LibraryCapability.ATTEMPT_TO_FIX); + + public static final List CAPABILITIES_SKIPPING = + Arrays.asList( + LibraryCapability.ATR, + LibraryCapability.EFD, + LibraryCapability.QUARANTINE, + LibraryCapability.ATTEMPT_TO_FIX, + LibraryCapability.TIA, + LibraryCapability.DISABLED); + public static Feature getFeature(FeatureRuntime featureRuntime) { if (FEATURE_RUNTIME_FEATURE_CALL_GETTER != null) { Object featureCall = @@ -151,20 +167,11 @@ public static boolean isSetupTagSupported(String version) { return version != null && karateV13.compareTo(new ComparableVersion(version)) <= 0; } - public static List availableCapabilities(String frameworkVersion) { - List baseCapabilities = - new ArrayList<>( - Arrays.asList( - LibraryCapability.ATR, - LibraryCapability.EFD, - LibraryCapability.QUARANTINE, - LibraryCapability.ATTEMPT_TO_FIX)); - + public static List capabilities(String frameworkVersion) { if (isSkippingSupported(frameworkVersion)) { - baseCapabilities.add(LibraryCapability.TIA); - baseCapabilities.add(LibraryCapability.DISABLED); + return CAPABILITIES_SKIPPING; } - return baseCapabilities; + return CAPABILITIES_BASE; } } diff --git a/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/TestEventsHandlerHolder.java b/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/TestEventsHandlerHolder.java index 1f293994737..40a3ad8195d 100644 --- a/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/TestEventsHandlerHolder.java +++ b/dd-java-agent/instrumentation/karate/src/main/java/datadog/trace/instrumentation/karate/TestEventsHandlerHolder.java @@ -23,10 +23,7 @@ public abstract class TestEventsHandlerHolder { public static void start() { TEST_EVENTS_HANDLER = InstrumentationBridge.createTestEventsHandler( - "karate", - null, - null, - KarateUtils.availableCapabilities(KarateTracingHook.FRAMEWORK_VERSION)); + "karate", null, null, KarateUtils.capabilities(KarateTracingHook.FRAMEWORK_VERSION)); } public static void stop() { diff --git a/dd-java-agent/instrumentation/karate/src/test/groovy/KarateTest.groovy b/dd-java-agent/instrumentation/karate/src/test/groovy/KarateTest.groovy index d0ec581ad05..b9c421f57d8 100644 --- a/dd-java-agent/instrumentation/karate/src/test/groovy/KarateTest.groovy +++ b/dd-java-agent/instrumentation/karate/src/test/groovy/KarateTest.groovy @@ -1,13 +1,7 @@ -import com.intuit.karate.FileUtils -import datadog.trace.agent.test.asserts.ListWriterAssert -import datadog.trace.api.DDSpanTypes -import datadog.trace.api.DDTags import datadog.trace.api.DisableTestTrace import datadog.trace.api.civisibility.config.TestFQN import datadog.trace.api.civisibility.config.TestIdentifier import datadog.trace.civisibility.CiVisibilityInstrumentationTest -import datadog.trace.civisibility.CiVisibilityTestUtils -import datadog.trace.civisibility.config.LibraryCapabilityUtils import datadog.trace.instrumentation.karate.KarateUtils import datadog.trace.instrumentation.karate.TestEventsHandlerHolder import org.example.* @@ -183,39 +177,14 @@ class KarateTest extends CiVisibilityInstrumentationTest { def "test capabilities tagging #testcaseName"() { Assumptions.assumeTrue(assumption) - def notPresentTags = new HashSet<>(LibraryCapabilityUtils.CAPABILITY_TAG_MAP.values()) - notPresentTags.removeAll(presentTags) - runTests([TestSucceedOneCaseKarate], true) - ListWriterAssert.assertTraces(TEST_WRITER, 5, true, new CiVisibilityTestUtils.SortTracesByType(), { - trace(1) { - span(0) { - spanType DDSpanTypes.TEST - tags(false) { - arePresent(presentTags) - areNotPresent(notPresentTags) - } - } - } - }) + assertCapabilities(capabilities, 5) where: - testcaseName | presentTags | assumption - "test-capabilities-base" | [ - DDTags.LIBRARY_CAPABILITIES_ATR, - DDTags.LIBRARY_CAPABILITIES_EFD, - DDTags.LIBRARY_CAPABILITIES_QUARANTINE, - DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX - ] | !KarateUtils.isSkippingSupported(KarateUtils.getKarateVersion()) - "test-capabilities-skipping" | [ - DDTags.LIBRARY_CAPABILITIES_ATR, - DDTags.LIBRARY_CAPABILITIES_EFD, - DDTags.LIBRARY_CAPABILITIES_QUARANTINE, - DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX, - DDTags.LIBRARY_CAPABILITIES_TIA, - DDTags.LIBRARY_CAPABILITIES_DISABLED - ] | KarateUtils.isSkippingSupported(KarateUtils.getKarateVersion()) + testcaseName | capabilities | assumption + "test-capabilities-base" | KarateUtils.CAPABILITIES_BASE | !KarateUtils.isSkippingSupported(KarateUtils.getKarateVersion()) + "test-capabilities-skipping" | KarateUtils.CAPABILITIES_SKIPPING | KarateUtils.isSkippingSupported(KarateUtils.getKarateVersion()) } private void runTests(List> tests, boolean expectSuccess = true) { diff --git a/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/RunContext.java b/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/RunContext.java index 0c668809926..c89d4fd9a81 100644 --- a/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/RunContext.java +++ b/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/RunContext.java @@ -1,7 +1,6 @@ package datadog.trace.instrumentation.scalatest; import datadog.trace.api.civisibility.InstrumentationBridge; -import datadog.trace.api.civisibility.config.LibraryCapability; import datadog.trace.api.civisibility.config.TestIdentifier; import datadog.trace.api.civisibility.config.TestSourceData; import datadog.trace.api.civisibility.events.TestDescriptor; @@ -11,8 +10,6 @@ import datadog.trace.api.civisibility.execution.TestExecutionPolicy; import datadog.trace.api.civisibility.telemetry.tag.SkipReason; import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import javax.annotation.Nullable; @@ -38,17 +35,9 @@ public static void destroy(int runStamp) { private final int runStamp; - private final List availableCapabilities = - Arrays.asList( - LibraryCapability.TIA, - LibraryCapability.EFD, - LibraryCapability.ATR, - LibraryCapability.IMPACTED, - LibraryCapability.QUARANTINE, - LibraryCapability.DISABLED, - LibraryCapability.ATTEMPT_TO_FIX); private final TestEventsHandler eventHandler = - InstrumentationBridge.createTestEventsHandler("scalatest", null, null, availableCapabilities); + InstrumentationBridge.createTestEventsHandler( + "scalatest", null, null, ScalatestUtils.CAPABILITIES); private final java.util.Map skipReasonByTest = new ConcurrentHashMap<>(); diff --git a/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestUtils.java b/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestUtils.java index 16dcf2c861d..140b276244a 100644 --- a/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestUtils.java +++ b/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/ScalatestUtils.java @@ -1,7 +1,10 @@ package datadog.trace.instrumentation.scalatest; +import datadog.trace.api.civisibility.config.LibraryCapability; import java.io.InputStream; import java.net.URL; +import java.util.Arrays; +import java.util.List; import java.util.Properties; import javax.annotation.Nullable; import org.scalatest.Reporter; @@ -15,6 +18,16 @@ public abstract class ScalatestUtils { private static final ClassLoader CLASS_LOADER = Reporter.class.getClassLoader(); + public static final List CAPABILITIES = + Arrays.asList( + LibraryCapability.TIA, + LibraryCapability.EFD, + LibraryCapability.ATR, + LibraryCapability.IMPACTED, + LibraryCapability.QUARANTINE, + LibraryCapability.DISABLED, + LibraryCapability.ATTEMPT_TO_FIX); + private ScalatestUtils() {} public static @Nullable String getScalatestVersion() { diff --git a/dd-java-agent/instrumentation/scalatest/src/test/groovy/ScalatestTest.groovy b/dd-java-agent/instrumentation/scalatest/src/test/groovy/ScalatestTest.groovy index 465094a6a4b..78ed3dfc046 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/groovy/ScalatestTest.groovy +++ b/dd-java-agent/instrumentation/scalatest/src/test/groovy/ScalatestTest.groovy @@ -1,11 +1,6 @@ -import datadog.trace.agent.test.asserts.ListWriterAssert -import datadog.trace.api.DDSpanTypes -import datadog.trace.api.DDTags import datadog.trace.api.civisibility.config.TestFQN import datadog.trace.api.civisibility.config.TestIdentifier import datadog.trace.civisibility.CiVisibilityInstrumentationTest -import datadog.trace.civisibility.CiVisibilityTestUtils -import datadog.trace.civisibility.config.LibraryCapabilityUtils import datadog.trace.civisibility.diff.FileDiff import datadog.trace.civisibility.diff.LineDiff import datadog.trace.instrumentation.scalatest.ScalatestUtils @@ -184,34 +179,11 @@ class ScalatestTest extends CiVisibilityInstrumentationTest { } def "test capabilities tagging #testcaseName"() { - def notPresentTags = new HashSet<>(LibraryCapabilityUtils.CAPABILITY_TAG_MAP.values()) - notPresentTags.removeAll(presentTags) - + setup: runTests([TestSucceed], true) - ListWriterAssert.assertTraces(TEST_WRITER, 4, true, new CiVisibilityTestUtils.SortTracesByType(), { - trace(1) { - span(0) { - spanType DDSpanTypes.TEST - tags(false) { - arePresent(presentTags) - areNotPresent(notPresentTags) - } - } - } - }) - - where: - testcaseName | presentTags - "test-capabilities-base" | [ - DDTags.LIBRARY_CAPABILITIES_TIA, - DDTags.LIBRARY_CAPABILITIES_ATR, - DDTags.LIBRARY_CAPABILITIES_EFD, - DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS, - DDTags.LIBRARY_CAPABILITIES_QUARANTINE, - DDTags.LIBRARY_CAPABILITIES_DISABLED, - DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX - ] + expect: + assertCapabilities(ScalatestUtils.CAPABILITIES, 4) } @Override diff --git a/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestEventsHandlerHolder.java b/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestEventsHandlerHolder.java index f791466d41e..d8dc16d391f 100644 --- a/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestEventsHandlerHolder.java +++ b/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TestEventsHandlerHolder.java @@ -32,10 +32,7 @@ public static synchronized void setContextStore(ContextStore availableCapabilities(String version) { + public static List capabilities(String version) { List baseCapabilities = new ArrayList<>( Arrays.asList( diff --git a/dd-java-agent/instrumentation/testng/src/testFixtures/groovy/datadog/trace/instrumentation/testng/TestNGTest.groovy b/dd-java-agent/instrumentation/testng/src/testFixtures/groovy/datadog/trace/instrumentation/testng/TestNGTest.groovy index 8454e0888e3..2e2e2127ade 100644 --- a/dd-java-agent/instrumentation/testng/src/testFixtures/groovy/datadog/trace/instrumentation/testng/TestNGTest.groovy +++ b/dd-java-agent/instrumentation/testng/src/testFixtures/groovy/datadog/trace/instrumentation/testng/TestNGTest.groovy @@ -1,13 +1,9 @@ package datadog.trace.instrumentation.testng -import datadog.trace.agent.test.asserts.ListWriterAssert -import datadog.trace.api.DDSpanTypes -import datadog.trace.api.DDTags + import datadog.trace.api.civisibility.config.TestFQN import datadog.trace.api.civisibility.config.TestIdentifier import datadog.trace.civisibility.CiVisibilityInstrumentationTest -import datadog.trace.civisibility.CiVisibilityTestUtils -import datadog.trace.civisibility.config.LibraryCapabilityUtils import datadog.trace.civisibility.diff.FileDiff import datadog.trace.civisibility.diff.LineDiff import org.example.* @@ -275,46 +271,15 @@ abstract class TestNGTest extends CiVisibilityInstrumentationTest { def "test capabilities tagging #testcaseName"() { Assumptions.assumeTrue(assumption) - def notPresentTags = new HashSet<>(LibraryCapabilityUtils.CAPABILITY_TAG_MAP.values()) - notPresentTags.removeAll(presentTags) - runTests([TestSucceed], null, true) - ListWriterAssert.assertTraces(TEST_WRITER, 4, true, new CiVisibilityTestUtils.SortTracesByType(), { - trace(1) { - span(0) { - spanType DDSpanTypes.TEST - tags(false) { - arePresent(presentTags) - areNotPresent(notPresentTags) - } - } - } - }) + assertCapabilities(capabilities, 4) where: - testcaseName | presentTags | assumption - "test-capabilities-base" | [ - DDTags.LIBRARY_CAPABILITIES_TIA, - DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS, - DDTags.LIBRARY_CAPABILITIES_DISABLED - ] | (!TestNGUtils.isTestOrderingSupported(currentTestNGVersion) && !TestNGUtils.isEFDSupported(currentTestNGVersion) && !TestNGUtils.isExceptionSuppressionSupported(currentTestNGVersion)) - "test-capabilities-ordering" | [ - DDTags.LIBRARY_CAPABILITIES_TIA, - DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS, - DDTags.LIBRARY_CAPABILITIES_DISABLED, - DDTags.LIBRARY_CAPABILITIES_FAIL_FAST_TEST_ORDER - ] | (TestNGUtils.isTestOrderingSupported(currentTestNGVersion) && !TestNGUtils.isEFDSupported(currentTestNGVersion) && !TestNGUtils.isExceptionSuppressionSupported(currentTestNGVersion)) - "test-capabilities-ordering-efd-suppression" | [ - DDTags.LIBRARY_CAPABILITIES_TIA, - DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS, - DDTags.LIBRARY_CAPABILITIES_DISABLED, - DDTags.LIBRARY_CAPABILITIES_FAIL_FAST_TEST_ORDER, - DDTags.LIBRARY_CAPABILITIES_EFD, - DDTags.LIBRARY_CAPABILITIES_ATR, - DDTags.LIBRARY_CAPABILITIES_QUARANTINE, - DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX - ] | (TestNGUtils.isTestOrderingSupported(currentTestNGVersion) && TestNGUtils.isEFDSupported(currentTestNGVersion) && TestNGUtils.isExceptionSuppressionSupported(currentTestNGVersion)) + testcaseName | capabilities | assumption + "test-capabilities-base" | TestNGUtils.capabilities("6.0") | (!TestNGUtils.isTestOrderingSupported(currentTestNGVersion) && !TestNGUtils.isEFDSupported(currentTestNGVersion) && !TestNGUtils.isExceptionSuppressionSupported(currentTestNGVersion)) + "test-capabilities-ordering" | TestNGUtils.capabilities("7.0") | (TestNGUtils.isTestOrderingSupported(currentTestNGVersion) && !TestNGUtils.isEFDSupported(currentTestNGVersion) && !TestNGUtils.isExceptionSuppressionSupported(currentTestNGVersion)) + "test-capabilities-ordering-efd-suppression" | TestNGUtils.capabilities("7.5") | (TestNGUtils.isTestOrderingSupported(currentTestNGVersion) && TestNGUtils.isEFDSupported(currentTestNGVersion) && TestNGUtils.isExceptionSuppressionSupported(currentTestNGVersion)) } protected void runTests(List testClasses, String parallelMode = null, boolean expectSuccess = true) { diff --git a/dd-java-agent/instrumentation/weaver/src/main/java/datadog/trace/instrumentation/weaver/DatadogWeaverReporter.java b/dd-java-agent/instrumentation/weaver/src/main/java/datadog/trace/instrumentation/weaver/DatadogWeaverReporter.java index 3141e04c0ad..7ba5d31906e 100644 --- a/dd-java-agent/instrumentation/weaver/src/main/java/datadog/trace/instrumentation/weaver/DatadogWeaverReporter.java +++ b/dd-java-agent/instrumentation/weaver/src/main/java/datadog/trace/instrumentation/weaver/DatadogWeaverReporter.java @@ -40,7 +40,7 @@ public static synchronized void start() { if (TEST_EVENTS_HANDLER == null) { TEST_EVENTS_HANDLER = InstrumentationBridge.createTestEventsHandler( - "weaver", null, null, WeaverUtils.availableCapabilities()); + "weaver", null, null, WeaverUtils.CAPABILITIES); } } diff --git a/dd-java-agent/instrumentation/weaver/src/main/java/datadog/trace/instrumentation/weaver/WeaverUtils.java b/dd-java-agent/instrumentation/weaver/src/main/java/datadog/trace/instrumentation/weaver/WeaverUtils.java index 3ca154c92a3..c06b8f5c6f5 100644 --- a/dd-java-agent/instrumentation/weaver/src/main/java/datadog/trace/instrumentation/weaver/WeaverUtils.java +++ b/dd-java-agent/instrumentation/weaver/src/main/java/datadog/trace/instrumentation/weaver/WeaverUtils.java @@ -17,6 +17,8 @@ public abstract class WeaverUtils { private static final ClassLoader CLASS_LOADER = SbtTask.class.getClassLoader(); + public static final List CAPABILITIES = Collections.emptyList(); + private WeaverUtils() {} public static @Nullable String getWeaverVersion() { @@ -52,8 +54,4 @@ public static Class getClass(String className) { return null; } } - - public static List availableCapabilities() { - return Collections.emptyList(); - } } diff --git a/dd-java-agent/instrumentation/weaver/src/test/groovy/WeaverTest.groovy b/dd-java-agent/instrumentation/weaver/src/test/groovy/WeaverTest.groovy index e8f04776454..93287de01e1 100644 --- a/dd-java-agent/instrumentation/weaver/src/test/groovy/WeaverTest.groovy +++ b/dd-java-agent/instrumentation/weaver/src/test/groovy/WeaverTest.groovy @@ -1,9 +1,5 @@ -import datadog.trace.agent.test.asserts.ListWriterAssert -import datadog.trace.api.DDSpanTypes -import datadog.trace.api.DDTags import datadog.trace.api.DisableTestTrace import datadog.trace.civisibility.CiVisibilityInstrumentationTest -import datadog.trace.civisibility.CiVisibilityTestUtils import datadog.trace.instrumentation.weaver.DatadogWeaverReporter import datadog.trace.instrumentation.weaver.WeaverIntegrationTestRunner import datadog.trace.instrumentation.weaver.WeaverUtils @@ -43,25 +39,7 @@ class WeaverTest extends CiVisibilityInstrumentationTest { runTests([TestSucceed]) expect: - ListWriterAssert.assertTraces(TEST_WRITER, 4, true, new CiVisibilityTestUtils.SortTracesByType(), { - trace(1) { - span(0) { - spanType DDSpanTypes.TEST - tags(false) { - areNotPresent([ - DDTags.LIBRARY_CAPABILITIES_TIA, - DDTags.LIBRARY_CAPABILITIES_EFD, - DDTags.LIBRARY_CAPABILITIES_ATR, - DDTags.LIBRARY_CAPABILITIES_IMPACTED_TESTS, - DDTags.LIBRARY_CAPABILITIES_FAIL_FAST_TEST_ORDER, - DDTags.LIBRARY_CAPABILITIES_QUARANTINE, - DDTags.LIBRARY_CAPABILITIES_DISABLED, - DDTags.LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX - ]) - } - } - } - }) + assertCapabilities(WeaverUtils.CAPABILITIES, 4) } @Override diff --git a/dd-trace-api/src/main/java/datadog/trace/api/DDTags.java b/dd-trace-api/src/main/java/datadog/trace/api/DDTags.java index 786937350c7..11bb60129fb 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/DDTags.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/DDTags.java @@ -60,22 +60,6 @@ public class DDTags { public static final String CI_ENV_VARS = "_dd.ci.env_vars"; public static final String CI_ITR_TESTS_SKIPPED = "_dd.ci.itr.tests_skipped"; public static final String TEST_IS_USER_PROVIDED_SERVICE = "_dd.test.is_user_provided_service"; - public static final String LIBRARY_CAPABILITIES_TIA = - "_dd.library_capabilities.test_impact_analysis"; - public static final String LIBRARY_CAPABILITIES_EFD = - "_dd.library_capabilities.early_flake_detection"; - public static final String LIBRARY_CAPABILITIES_ATR = - "_dd.library_capabilities.auto_test_retries"; - public static final String LIBRARY_CAPABILITIES_IMPACTED_TESTS = - "_dd.library_capabilities.impacted_tests"; - public static final String LIBRARY_CAPABILITIES_FAIL_FAST_TEST_ORDER = - "_dd.library_capabilities.fail_fast_test_order"; - public static final String LIBRARY_CAPABILITIES_QUARANTINE = - "_dd.library_capabilities.test_management.quarantine"; - public static final String LIBRARY_CAPABILITIES_DISABLED = - "_dd.library_capabilities.test_management.disable"; - public static final String LIBRARY_CAPABILITIES_ATTEMPT_TO_FIX = - "_dd.library_capabilities.test_management.attempt_to_fix"; public static final String MEASURED = "_dd.measured"; public static final String PID_TAG = "process_id"; public static final String SCHEMA_VERSION_TAG_KEY = "_dd.trace_span_attribute_schema"; diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/InstrumentationBridge.java b/internal-api/src/main/java/datadog/trace/api/civisibility/InstrumentationBridge.java index 8cd91d37fbf..a24bad6b28f 100644 --- a/internal-api/src/main/java/datadog/trace/api/civisibility/InstrumentationBridge.java +++ b/internal-api/src/main/java/datadog/trace/api/civisibility/InstrumentationBridge.java @@ -26,9 +26,8 @@ public static TestEventsHandler createTes String component, ContextStore suiteStore, ContextStore testStore, - Collection availableCapabilities) { - return TEST_EVENTS_HANDLER_FACTORY.create( - component, suiteStore, testStore, availableCapabilities); + Collection capabilities) { + return TEST_EVENTS_HANDLER_FACTORY.create(component, suiteStore, testStore, capabilities); } public static void registerBuildEventsHandlerFactory( diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/config/LibraryCapability.java b/internal-api/src/main/java/datadog/trace/api/civisibility/config/LibraryCapability.java index a7b786d7cec..7e3980fc51f 100644 --- a/internal-api/src/main/java/datadog/trace/api/civisibility/config/LibraryCapability.java +++ b/internal-api/src/main/java/datadog/trace/api/civisibility/config/LibraryCapability.java @@ -1,12 +1,22 @@ package datadog.trace.api.civisibility.config; public enum LibraryCapability { - TIA, - EFD, - ATR, - IMPACTED, - FAIL_FAST, - QUARANTINE, - DISABLED, - ATTEMPT_TO_FIX + TIA("test_impact_analysis"), + EFD("early_flake_detection"), + ATR("auto_test_retries"), + IMPACTED("impacted_tests"), + FAIL_FAST("fail_fast_test_order"), + QUARANTINE("test_management.quarantine"), + DISABLED("test_management.disable"), + ATTEMPT_TO_FIX("test_management.attempt_to_fix"); + + private final String tag; + + LibraryCapability(String tag) { + this.tag = tag; + } + + public String asTag() { + return "_dd.library_capabilities." + tag; + } } diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestEventsHandler.java b/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestEventsHandler.java index f9be85bd08a..908291e5c07 100644 --- a/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestEventsHandler.java +++ b/internal-api/src/main/java/datadog/trace/api/civisibility/events/TestEventsHandler.java @@ -118,6 +118,6 @@ TestEventsHandler create( String component, @Nullable ContextStore suiteStore, @Nullable ContextStore testStore, - Collection availableCapabilities); + Collection capabilities); } } From 4238c3b8e116e8f2408c68c10d6a428bbdf6fe60 Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Wed, 5 Mar 2025 16:31:07 +0100 Subject: [PATCH 36/41] fix execution settings tests with sys config injection --- .../civisibility/config/ExecutionSettingsTest.groovy | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/ExecutionSettingsTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/ExecutionSettingsTest.groovy index b4406e99c09..495767cf336 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/ExecutionSettingsTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/ExecutionSettingsTest.groovy @@ -1,21 +1,19 @@ package datadog.trace.civisibility.config -import datadog.trace.api.Config import datadog.trace.api.civisibility.CIConstants import datadog.trace.api.civisibility.config.LibraryCapability import datadog.trace.api.civisibility.config.TestFQN import datadog.trace.api.civisibility.config.TestIdentifier import datadog.trace.api.civisibility.config.TestMetadata -import datadog.trace.civisibility.diff.Diff +import datadog.trace.api.config.CiVisibilityConfig import datadog.trace.civisibility.diff.LineDiff -import datadog.trace.civisibility.diff.LineDiffTest -import spock.lang.Specification +import datadog.trace.test.util.DDSpecification import java.util.stream.Collectors import static datadog.trace.civisibility.TestUtils.lines -class ExecutionSettingsTest extends Specification { +class ExecutionSettingsTest extends DDSpecification { def "test serialization: #settings"() { when: @@ -130,6 +128,10 @@ class ExecutionSettingsTest extends Specification { } private ExecutionSettings givenExecutionSettings(boolean settingsEnabled) { + if (settingsEnabled) { + injectSysConfig(CiVisibilityConfig.CIVISIBILITY_TEST_ORDER, CIConstants.FAIL_FAST_TEST_ORDER) + } + def testManagementSettings = Stub(TestManagementSettings) testManagementSettings.isEnabled() >> settingsEnabled From 0dcea22ff084ab7ee9bce393fd4d0bb264923ff5 Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Wed, 5 Mar 2025 16:46:28 +0100 Subject: [PATCH 37/41] fix TestImplTest --- .../trace/civisibility/domain/TestImplTest.groovy | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy index a520ee5e5b1..e1e659010f9 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy @@ -35,11 +35,11 @@ class TestImplTest extends SpanWriterTest { parent() spanType DDSpanTypes.TEST tags(false) { - "$LibraryCapability.TIA.asTag()" true - "$LibraryCapability.EFD.asTag()" false - "$LibraryCapability.QUARANTINE.asTag()" true - "$LibraryCapability.DISABLED.asTag()" false - "$LibraryCapability.ATTEMPT_TO_FIX.asTag()" true + "${LibraryCapability.TIA.asTag()}" true + "${LibraryCapability.EFD.asTag()}" false + "${LibraryCapability.QUARANTINE.asTag()}" true + "${LibraryCapability.DISABLED.asTag()}" false + "${LibraryCapability.ATTEMPT_TO_FIX.asTag()}" true } } } From f7aa7550255dbc60839e74e84cca3c7fa373abbe Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Wed, 5 Mar 2025 17:06:44 +0100 Subject: [PATCH 38/41] fix master merge --- .../datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java | 1 + 1 file changed, 1 insertion(+) diff --git a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java index 2e6e2011ff0..7065aef9af2 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java +++ b/dd-java-agent/instrumentation/junit-5.3/src/main/java/datadog/trace/instrumentation/junit5/JUnitPlatformUtils.java @@ -311,6 +311,7 @@ public static List capabilities(TestEngine testEngine) { return JUNIT_CAPABILITIES_BASE; } } + } public static List getTags(TestDescriptor testDescriptor) { return testDescriptor.getTags().stream().map(TestTag::getName).collect(Collectors.toList()); From 28c23102372acdad224e4c0e31c4bcabaa433c83 Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Wed, 5 Mar 2025 17:15:16 +0100 Subject: [PATCH 39/41] remove library capability utils --- .../config/LibraryCapabilityUtils.java | 33 ------------------- .../src/test/groovy/CucumberTest.groovy | 5 --- .../src/test/groovy/CucumberTest.groovy | 5 --- .../src/test/groovy/JUnit58Test.groovy | 6 ---- .../src/test/groovy/SpockTest.groovy | 6 ---- 5 files changed, 55 deletions(-) delete mode 100644 dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/LibraryCapabilityUtils.java diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/LibraryCapabilityUtils.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/LibraryCapabilityUtils.java deleted file mode 100644 index 053a2ec9499..00000000000 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/LibraryCapabilityUtils.java +++ /dev/null @@ -1,33 +0,0 @@ -package datadog.trace.civisibility.config; - -import datadog.trace.api.civisibility.config.LibraryCapability; -import java.util.Collection; -import java.util.EnumMap; -import java.util.HashMap; -import java.util.Map; - -public abstract class LibraryCapabilityUtils { - - public static final Map CAPABILITY_TAG_MAP = capabilitiesTagMap(); - - private static Map capabilitiesTagMap() { - Map capabilitiesTags = new EnumMap<>(LibraryCapability.class); - capabilitiesTags.put(LibraryCapability.TIA, LibraryCapability.TIA.asTag()); - capabilitiesTags.put(LibraryCapability.EFD, LibraryCapability.EFD.asTag()); - capabilitiesTags.put(LibraryCapability.ATR, LibraryCapability.ATR.asTag()); - capabilitiesTags.put(LibraryCapability.IMPACTED, LibraryCapability.IMPACTED.asTag()); - capabilitiesTags.put(LibraryCapability.FAIL_FAST, LibraryCapability.FAIL_FAST.asTag()); - capabilitiesTags.put(LibraryCapability.QUARANTINE, LibraryCapability.QUARANTINE.asTag()); - capabilitiesTags.put(LibraryCapability.DISABLED, LibraryCapability.DISABLED.asTag()); - capabilitiesTags.put( - LibraryCapability.ATTEMPT_TO_FIX, LibraryCapability.ATTEMPT_TO_FIX.asTag()); - return capabilitiesTags; - } - - public static Map filterCapabilities( - Collection available, Map capabilitiesStatus) { - Map capabilities = new HashMap<>(capabilitiesStatus); - capabilities.keySet().retainAll(available); - return capabilities; - } -} diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy index d023c676256..491bfb3bd48 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy @@ -1,13 +1,8 @@ -import datadog.trace.agent.test.asserts.ListWriterAssert -import datadog.trace.api.DDSpanTypes import datadog.trace.api.DisableTestTrace -import datadog.trace.api.civisibility.config.LibraryCapability import datadog.trace.api.civisibility.config.TestFQN import datadog.trace.api.civisibility.config.TestIdentifier import datadog.trace.api.civisibility.telemetry.tag.TestFrameworkInstrumentation import datadog.trace.civisibility.CiVisibilityInstrumentationTest -import datadog.trace.civisibility.CiVisibilityTestUtils -import datadog.trace.civisibility.config.LibraryCapabilityUtils import datadog.trace.instrumentation.junit4.CucumberTracingListener import datadog.trace.instrumentation.junit4.CucumberUtils import datadog.trace.instrumentation.junit4.TestEventsHandlerHolder diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy index 754cffa1e21..549b16791c1 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/groovy/CucumberTest.groovy @@ -1,12 +1,7 @@ -import datadog.trace.agent.test.asserts.ListWriterAssert -import datadog.trace.api.DDSpanTypes -import datadog.trace.api.DDTags import datadog.trace.api.DisableTestTrace import datadog.trace.api.civisibility.config.TestFQN import datadog.trace.api.civisibility.config.TestIdentifier import datadog.trace.civisibility.CiVisibilityInstrumentationTest -import datadog.trace.civisibility.CiVisibilityTestUtils -import datadog.trace.civisibility.config.LibraryCapabilityUtils import datadog.trace.instrumentation.junit5.JUnitPlatformUtils import datadog.trace.instrumentation.junit5.TestEventsHandlerHolder import io.cucumber.core.api.TypeRegistry diff --git a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy index f322d3b8cd9..46cc26e1d76 100644 --- a/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy +++ b/dd-java-agent/instrumentation/junit-5.3/junit-5.8/src/test/groovy/JUnit58Test.groovy @@ -1,11 +1,5 @@ -import datadog.trace.agent.test.asserts.ListWriterAssert -import datadog.trace.api.DDSpanTypes -import datadog.trace.api.DDTags import datadog.trace.api.DisableTestTrace -import datadog.trace.api.civisibility.CIConstants import datadog.trace.civisibility.CiVisibilityInstrumentationTest -import datadog.trace.civisibility.CiVisibilityTestUtils -import datadog.trace.civisibility.config.LibraryCapabilityUtils import datadog.trace.instrumentation.junit5.JUnitPlatformUtils import datadog.trace.instrumentation.junit5.TestEventsHandlerHolder import org.example.* diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy index bb0b4e7d6d9..fe54b7399fa 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/groovy/SpockTest.groovy @@ -1,12 +1,7 @@ -import datadog.trace.agent.test.asserts.ListWriterAssert -import datadog.trace.api.DDSpanTypes -import datadog.trace.api.DDTags import datadog.trace.api.DisableTestTrace import datadog.trace.api.civisibility.config.TestFQN import datadog.trace.api.civisibility.config.TestIdentifier import datadog.trace.civisibility.CiVisibilityInstrumentationTest -import datadog.trace.civisibility.CiVisibilityTestUtils -import datadog.trace.civisibility.config.LibraryCapabilityUtils import datadog.trace.civisibility.diff.FileDiff import datadog.trace.civisibility.diff.LineDiff import datadog.trace.instrumentation.junit5.JUnitPlatformUtils @@ -25,7 +20,6 @@ import org.example.TestSucceedSpockSlow import org.example.TestSucceedSpockUnskippable import org.example.TestSucceedSpockUnskippableSuite import org.example.TestSucceedSpockVerySlow -import org.junit.jupiter.api.Assumptions import org.junit.platform.engine.DiscoverySelector import org.junit.platform.engine.TestExecutionResult import org.junit.platform.launcher.TestExecutionListener From bd09eef07c9b8d18323f224055e1fb90c606095b Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Wed, 5 Mar 2025 17:23:42 +0100 Subject: [PATCH 40/41] spotless ! --- .../trace/civisibility/domain/headless/HeadlessTestModule.java | 2 +- .../datadog/trace/instrumentation/junit4/CucumberUtils.java | 2 +- .../java/datadog/trace/instrumentation/junit4/MUnitUtils.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java index e1b8a03c81d..96c182990fd 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java @@ -28,8 +28,8 @@ import datadog.trace.civisibility.test.ExecutionResults; import datadog.trace.civisibility.test.ExecutionStrategy; import datadog.trace.civisibility.utils.SpanUtils; -import java.util.Map; import java.util.Collection; +import java.util.Map; import java.util.function.Consumer; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/CucumberUtils.java b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/CucumberUtils.java index c7170c3d90c..d3014374988 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/CucumberUtils.java +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/main/java/datadog/trace/instrumentation/junit4/CucumberUtils.java @@ -13,8 +13,8 @@ import java.io.InputStream; import java.lang.invoke.MethodHandle; import java.net.URI; -import java.util.Arrays; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.List; diff --git a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitUtils.java b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitUtils.java index 9ae6c03a37c..cb0755ffe0d 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitUtils.java +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/main/java/datadog/trace/instrumentation/junit4/MUnitUtils.java @@ -6,8 +6,8 @@ import datadog.trace.util.MethodHandles; import java.lang.annotation.Annotation; import java.lang.invoke.MethodHandle; -import java.util.Arrays; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import munit.MUnitRunner; import munit.Tag; From 02fa357a1d464666fd5d5e892226911e87ef67df Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Thu, 6 Mar 2025 09:44:57 +0100 Subject: [PATCH 41/41] change empty map call Co-authored-by: Nikita Tkachenko <121111529+nikita-tkachenko-datadog@users.noreply.github.com> --- .../civisibility/domain/manualapi/ManualApiTestModule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java index 125cff485aa..627edd654c4 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java @@ -80,7 +80,7 @@ public TestSuiteImpl testSuiteStart( linesResolver, coverageStoreFactory, executionResults, - Collections.EMPTY_MAP, + Collections.emptyMap(), SpanUtils.propagateCiVisibilityTagsTo(span)); } }