From 092783e7ba2e7e465d2ae5bdfdbdd74d4d1a01f4 Mon Sep 17 00:00:00 2001 From: Nikita Tkachenko Date: Fri, 5 Sep 2025 17:27:15 +0200 Subject: [PATCH 1/3] Introduce test ExecutionOutcome as a snapshot of TestExecutionHistory for a specific test execution --- .../events/NoOpTestEventsHandler.java | 3 +- .../events/TestEventsHandlerImpl.java | 34 ++-- .../execution/ExecutionOutcomeImpl.java | 53 ++++++ .../trace/civisibility/execution/Regular.java | 50 ++++-- .../execution/RetryUntilSuccessful.java | 47 ++--- .../civisibility/execution/RunNTimes.java | 39 ++-- .../execution/RunOnceIgnoreOutcome.java | 26 +-- .../buildsystem/ProxyTestModuleTest.groovy | 10 +- .../headless/HeadlessTestModuleTest.groovy | 10 +- .../execution/RegularExecutionTest.groovy | 22 +++ .../execution/RetryUntilSuccessfulTest.groovy | 155 ++++++++++++++++ .../execution/RunNTimesTest.groovy | 166 ++++++++++++++++++ .../execution/RunOnceIgnoreOutcomeTest.groovy | 37 ++++ .../test/ExecutionStrategyTest.groovy | 19 +- .../junit4/CucumberTracingListener.java | 3 +- .../Cucumber4ExecutionInstrumentation.java | 2 +- .../junit4/MUnitTracingListener.java | 4 +- .../MUnitExecutionInstrumentation.java | 2 +- .../junit4/JUnit4TracingListener.java | 3 +- .../JUnit4ExecutionInstrumentation.java | 2 +- .../src/test/groovy/JUnit4Test.groovy | 16 +- .../junit5/CucumberTracingListener.java | 3 +- .../junit5/SpockTracingListener.java | 3 +- .../junit5/TracingListener.java | 3 +- .../JUnit5ExecutionInstrumentation.java | 2 +- .../KarateExecutionInstrumentation.java | 2 +- .../karate/KarateTracingHook.java | 3 +- .../scalatest/DatadogReporter.java | 3 +- .../ScalatestExecutionInstrumentation.java | 2 +- .../execution/TestExecutionWrapper.java | 4 +- .../testng/TracingListener.java | 3 +- .../testng/execution/RetryAnalyzer.java | 2 +- .../weaver/DatadogWeaverReporter.java | 3 +- .../events/TestEventsHandler.java | 4 +- .../execution/TestExecutionHistory.java | 49 +++--- .../bootstrap/instrumentation/api/Tags.java | 1 + 36 files changed, 591 insertions(+), 199 deletions(-) create mode 100644 dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/ExecutionOutcomeImpl.java create mode 100644 dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/execution/RegularExecutionTest.groovy create mode 100644 dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/execution/RetryUntilSuccessfulTest.groovy create mode 100644 dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/execution/RunNTimesTest.groovy create mode 100644 dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/execution/RunOnceIgnoreOutcomeTest.groovy 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 0660bff05f2..334ec643b92 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 @@ -58,8 +58,7 @@ public void onTestStart( @Nullable String testParameters, @Nullable Collection categories, @Nonnull TestSourceData testSourceData, - @Nullable Long startTime, - @Nullable TestExecutionHistory testExecutionHistory) { + @Nullable Long startTime) { // do nothing } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestEventsHandlerImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestEventsHandlerImpl.java index 4dfe62b24bf..ae1a94f4c3d 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestEventsHandlerImpl.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestEventsHandlerImpl.java @@ -141,8 +141,7 @@ public void onTestStart( final @Nullable String testParameters, final @Nullable Collection categories, final @Nonnull TestSourceData testSourceData, - final @Nullable Long startTime, - final @Nullable TestExecutionHistory testExecutionHistory) { + final @Nullable Long startTime) { if (skipTrace(testSourceData.getTestClass())) { return; } @@ -180,14 +179,6 @@ public void onTestStart( test.setTag(Tags.TEST_TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX, true); } - if (testExecutionHistory != null) { - RetryReason retryReason = testExecutionHistory.currentExecutionRetryReason(); - if (retryReason != null) { - test.setTag(Tags.TEST_IS_RETRY, true); - test.setTag(Tags.TEST_RETRY_REASON, retryReason); - } - } - if (testFramework != null) { test.setTag(Tags.TEST_FRAMEWORK, testFramework); if (testFrameworkVersion != null) { @@ -254,20 +245,24 @@ public void onTestFinish( return; } - TestIdentifier thisTest = test.getIdentifier(); if (testExecutionHistory != null) { TestStatus testStatus = test.getStatus(); - testExecutionHistory.registerExecution( - testStatus != null ? testStatus : TestStatus.skip, test.getDuration(endTime)); + TestExecutionHistory.ExecutionOutcome outcome = + testExecutionHistory.registerExecution( + testStatus != null ? testStatus : TestStatus.skip, test.getDuration(endTime)); + + RetryReason retryReason = outcome.retryReason(); + if (retryReason != null) { + test.setTag(Tags.TEST_IS_RETRY, true); + test.setTag(Tags.TEST_RETRY_REASON, retryReason); + } - if (testExecutionHistory.hasFailedAllRetries()) { + if (outcome.failedAllRetries()) { test.setTag(Tags.TEST_HAS_FAILED_ALL_RETRIES, true); } - if (testExecutionHistory.wasLastExecution() && testModule.isAttemptToFix(thisTest)) { - test.setTag( - Tags.TEST_TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED, - testExecutionHistory.hasSucceededAllRetries()); + if (outcome.lastExecution() && testModule.isAttemptToFix(test.getIdentifier())) { + test.setTag(Tags.TEST_TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED, outcome.succeededAllRetries()); } } @@ -295,8 +290,7 @@ public void onTestIgnore( testParameters, categories, testSourceData, - null, - testExecutionHistory); + null); onTestSkip(testDescriptor, reason); onTestFinish(testDescriptor, null, testExecutionHistory); } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/ExecutionOutcomeImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/ExecutionOutcomeImpl.java new file mode 100644 index 00000000000..47b0fe76722 --- /dev/null +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/ExecutionOutcomeImpl.java @@ -0,0 +1,53 @@ +package datadog.trace.civisibility.execution; + +import datadog.trace.api.civisibility.execution.TestExecutionHistory; +import datadog.trace.api.civisibility.telemetry.tag.RetryReason; +import org.jetbrains.annotations.Nullable; + +class ExecutionOutcomeImpl implements TestExecutionHistory.ExecutionOutcome { + + private final boolean failureSuppressed; + private final boolean lastExecution; + private final boolean failedAllRetries; + private final boolean succeededAllRetries; + private final RetryReason retryReason; + + ExecutionOutcomeImpl( + boolean failureSuppressed, + boolean lastExecution, + boolean failedAllRetries, + boolean succeededAllRetries, + RetryReason retryReason) { + this.failureSuppressed = failureSuppressed; + this.lastExecution = lastExecution; + this.failedAllRetries = failedAllRetries; + this.succeededAllRetries = succeededAllRetries; + this.retryReason = retryReason; + } + + @Override + public boolean failureSuppressed() { + return failureSuppressed; + } + + @Override + public boolean lastExecution() { + return lastExecution; + } + + @Override + public boolean failedAllRetries() { + return failedAllRetries; + } + + @Override + public boolean succeededAllRetries() { + return succeededAllRetries; + } + + @Nullable + @Override + public RetryReason retryReason() { + return retryReason; + } +} diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/Regular.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/Regular.java index 434892bc98f..3e63375b60b 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/Regular.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/Regular.java @@ -1,5 +1,6 @@ package datadog.trace.civisibility.execution; +import datadog.trace.api.civisibility.execution.TestExecutionHistory; import datadog.trace.api.civisibility.execution.TestExecutionPolicy; import datadog.trace.api.civisibility.execution.TestStatus; import datadog.trace.api.civisibility.telemetry.tag.RetryReason; @@ -13,11 +14,8 @@ public class Regular implements TestExecutionPolicy { private Regular() {} @Override - public void registerExecution(TestStatus status, long durationMillis) {} - - @Override - public boolean wasLastExecution() { - return true; + public ExecutionOutcome registerExecution(TestStatus status, long durationMillis) { + return RegularExecutionOutcome.INSTANCE; } @Override @@ -30,19 +28,37 @@ public boolean suppressFailures() { return false; } - @Nullable - @Override - public RetryReason currentExecutionRetryReason() { - return null; - } + private static final class RegularExecutionOutcome + implements TestExecutionHistory.ExecutionOutcome { - @Override - public boolean hasFailedAllRetries() { - return false; - } + static final TestExecutionHistory.ExecutionOutcome INSTANCE = new RegularExecutionOutcome(); - @Override - public boolean hasSucceededAllRetries() { - return false; + private RegularExecutionOutcome() {} + + @Override + public boolean failureSuppressed() { + return false; + } + + @Override + public boolean lastExecution() { + return false; + } + + @Override + public boolean failedAllRetries() { + return false; + } + + @Override + public boolean succeededAllRetries() { + return false; + } + + @Nullable + @Override + public RetryReason retryReason() { + return null; + } } } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/RetryUntilSuccessful.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/RetryUntilSuccessful.java index 81fdeaa6c2d..95bd781fe80 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/RetryUntilSuccessful.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/RetryUntilSuccessful.java @@ -4,7 +4,6 @@ import datadog.trace.api.civisibility.execution.TestStatus; import datadog.trace.api.civisibility.telemetry.tag.RetryReason; import java.util.concurrent.atomic.AtomicInteger; -import javax.annotation.Nullable; /** Retries a test case if it failed, up to a maximum number of times. */ public class RetryUntilSuccessful implements TestExecutionPolicy { @@ -26,54 +25,38 @@ public RetryUntilSuccessful( } @Override - public void registerExecution(TestStatus status, long durationMillis) { + public ExecutionOutcome registerExecution(TestStatus status, long durationMillis) { ++executions; successfulExecutionSeen |= (status != TestStatus.fail); if (executions > 1) { totalRetryCount.incrementAndGet(); } - } - @Override - public boolean wasLastExecution() { - return successfulExecutionSeen || executions == maxExecutions; + boolean lastExecution = !retriesLeft(); + boolean retry = executions > 1; // first execution is not a retry + return new ExecutionOutcomeImpl( + status == TestStatus.fail && (!lastExecution || suppressFailures), + lastExecution, + lastExecution && !successfulExecutionSeen, + false, + retry ? RetryReason.atr : null); } - private boolean currentExecutionIsLast() { - return executions == maxExecutions - 1; + private boolean retriesLeft() { + return !successfulExecutionSeen && executions < maxExecutions; } @Override public boolean applicable() { // executions must always be registered, therefore consider it applicable as long as there are // retries left - return !wasLastExecution(); + return retriesLeft(); } @Override public boolean suppressFailures() { - // do not suppress failures for last execution - // (unless flag to suppress all failures is set) - return !currentExecutionIsLast() || suppressFailures; - } - - @Nullable - @Override - public RetryReason currentExecutionRetryReason() { - return currentExecutionIsRetry() ? RetryReason.atr : null; - } - - private boolean currentExecutionIsRetry() { - return executions > 0; - } - - @Override - public boolean hasFailedAllRetries() { - return wasLastExecution() && !successfulExecutionSeen; - } - - @Override - public boolean hasSucceededAllRetries() { - return false; + // do not suppress failures for last execution (unless flag to suppress all failures is set); + // the +1 is because this method is called _before_ subsequent execution is registered + return executions + 1 < maxExecutions || suppressFailures; } } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/RunNTimes.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/RunNTimes.java index 7201bb99c02..17cfa2fd3ba 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/RunNTimes.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/RunNTimes.java @@ -5,7 +5,6 @@ import datadog.trace.api.civisibility.telemetry.tag.RetryReason; import datadog.trace.civisibility.config.ExecutionsByDuration; import java.util.List; -import javax.annotation.Nullable; /** Runs a test case N times (N depends on test duration) regardless of success or failure. */ public class RunNTimes implements TestExecutionPolicy { @@ -31,7 +30,7 @@ public RunNTimes( } @Override - public void registerExecution(TestStatus status, long durationMillis) { + public ExecutionOutcome registerExecution(TestStatus status, long durationMillis) { lastStatus = status; ++executions; if (status != TestStatus.fail) { @@ -39,19 +38,27 @@ public void registerExecution(TestStatus status, long durationMillis) { } int maxExecutionsForGivenDuration = getExecutions(durationMillis); maxExecutions = Math.min(maxExecutions, maxExecutionsForGivenDuration); + + boolean lastExecution = !retriesLeft(); + boolean retry = executions > 1; // first execution is not a retry + return new ExecutionOutcomeImpl( + status == TestStatus.fail && suppressFailures(), + lastExecution, + lastExecution && successfulExecutionsSeen == 0, + lastExecution && successfulExecutionsSeen == executions, + retry ? retryReason : null); } - @Override - public boolean wasLastExecution() { + private boolean retriesLeft() { // skipped tests (either by the framework or DD) should not be retried - return lastStatus == TestStatus.skip || executions >= maxExecutions; + return lastStatus != TestStatus.skip && executions < maxExecutions; } @Override public boolean applicable() { // executions must always be registered, therefore consider it applicable as long as there are // retries left - return !wasLastExecution(); + return retriesLeft(); } @Override @@ -67,24 +74,4 @@ private int getExecutions(long durationMillis) { } return 0; } - - @Nullable - @Override - public RetryReason currentExecutionRetryReason() { - return currentExecutionIsRetry() ? retryReason : null; - } - - private boolean currentExecutionIsRetry() { - return executions > 0; - } - - @Override - public boolean hasFailedAllRetries() { - return wasLastExecution() && successfulExecutionsSeen == 0; - } - - @Override - public boolean hasSucceededAllRetries() { - return wasLastExecution() && successfulExecutionsSeen == executions; - } } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/RunOnceIgnoreOutcome.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/RunOnceIgnoreOutcome.java index 83c25e98514..77cc9e6f104 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/RunOnceIgnoreOutcome.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/execution/RunOnceIgnoreOutcome.java @@ -2,8 +2,6 @@ import datadog.trace.api.civisibility.execution.TestExecutionPolicy; import datadog.trace.api.civisibility.execution.TestStatus; -import datadog.trace.api.civisibility.telemetry.tag.RetryReason; -import javax.annotation.Nullable; /** * Runs a test case once. If it fails - suppresses the failure so that the build status is not @@ -14,13 +12,9 @@ public class RunOnceIgnoreOutcome implements TestExecutionPolicy { private boolean testExecuted; @Override - public void registerExecution(TestStatus status, long durationMillis) { + public ExecutionOutcome registerExecution(TestStatus status, long durationMillis) { testExecuted = true; - } - - @Override - public boolean wasLastExecution() { - return testExecuted; + return new ExecutionOutcomeImpl(status == TestStatus.fail, testExecuted, false, false, null); } @Override @@ -32,20 +26,4 @@ public boolean applicable() { public boolean suppressFailures() { return true; } - - @Nullable - @Override - public RetryReason currentExecutionRetryReason() { - return null; - } - - @Override - public boolean hasFailedAllRetries() { - return false; - } - - @Override - public boolean hasSucceededAllRetries() { - return false; - } } 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 fe2f3573234..b5310c20298 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 @@ -61,24 +61,24 @@ class ProxyTestModuleTest extends DDSpecification { then: retryPolicy1.registerExecution(TestStatus.fail, 1L) // 1st test execution - !retryPolicy1.wasLastExecution() + retryPolicy1.applicable() retryPolicy1.registerExecution(TestStatus.fail, 1L) // 2nd test execution, 1st retry globally - retryPolicy1.wasLastExecution() // asking for 3rd test execution - local limit reached + !retryPolicy1.applicable() // asking for 3rd test execution - local limit reached when: def retryPolicy2 = proxyTestModule.executionPolicy(new TestIdentifier("suite", "test-2", null), TestSourceData.UNKNOWN, []) then: retryPolicy2.registerExecution(TestStatus.fail, 1L) // 1st test execution - !retryPolicy2.wasLastExecution() + retryPolicy2.applicable() retryPolicy2.registerExecution(TestStatus.fail, 1L) // 2nd test execution, 1st retry globally - retryPolicy2.wasLastExecution() // asking for 3rd test execution - local limit reached + !retryPolicy2.applicable() // asking for 3rd test execution - local limit reached when: def retryPolicy3 = proxyTestModule.executionPolicy(new TestIdentifier("suite", "test-3", null), TestSourceData.UNKNOWN, []) then: retryPolicy3.registerExecution(TestStatus.fail, 1L) // 1st test execution - retryPolicy3.wasLastExecution() // asking for 3rd retry globally - global limit reached + !retryPolicy3.applicable() // asking for 3rd retry globally - global limit reached } } 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 6268e00a37e..3cbe1b6c571 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 @@ -26,25 +26,25 @@ class HeadlessTestModuleTest extends SpanWriterTest { then: retryPolicy1.registerExecution(TestStatus.fail, 1L) // 1st test execution - !retryPolicy1.wasLastExecution() + retryPolicy1.applicable() retryPolicy1.registerExecution(TestStatus.fail, 1L) // 2nd test execution, 1st retry globally - retryPolicy1.wasLastExecution() // asking for 3rd test execution - local limit reached + !retryPolicy1.applicable() // asking for 3rd test execution - local limit reached when: def retryPolicy2 = headlessTestModule.executionPolicy(new TestIdentifier("suite", "test-2", null), TestSourceData.UNKNOWN, []) then: retryPolicy2.registerExecution(TestStatus.fail, 1L) // 1st test execution - !retryPolicy2.wasLastExecution() + retryPolicy2.applicable() retryPolicy2.registerExecution(TestStatus.fail, 1L) // 2nd test execution, 1st retry globally - retryPolicy2.wasLastExecution() // asking for 3rd test execution - local limit reached + !retryPolicy2.applicable() // asking for 3rd test execution - local limit reached when: def retryPolicy3 = headlessTestModule.executionPolicy(new TestIdentifier("suite", "test-3", null), TestSourceData.UNKNOWN, []) then: retryPolicy3.registerExecution(TestStatus.fail, 1L) // 1st test execution - retryPolicy3.wasLastExecution() // asking for 3rd retry globally - global limit reached + !retryPolicy3.applicable() // asking for 3rd retry globally - global limit reached } private HeadlessTestModule givenAHeadlessTestModule() { diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/execution/RegularExecutionTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/execution/RegularExecutionTest.groovy new file mode 100644 index 00000000000..9c614363ee1 --- /dev/null +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/execution/RegularExecutionTest.groovy @@ -0,0 +1,22 @@ +package datadog.trace.civisibility.execution + +import datadog.trace.api.civisibility.execution.TestStatus +import spock.lang.Specification + +class RegularExecutionTest extends Specification { + + def "test regular execution outcome"() { + setup: + def executionPolicy = Regular.INSTANCE + + when: + def outcome = executionPolicy.registerExecution(TestStatus.pass, 0) + + then: + outcome.retryReason() == null + !outcome.lastExecution() + !outcome.failureSuppressed() + !outcome.failedAllRetries() + !outcome.succeededAllRetries() + } +} diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/execution/RetryUntilSuccessfulTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/execution/RetryUntilSuccessfulTest.groovy new file mode 100644 index 00000000000..f27c79c5895 --- /dev/null +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/execution/RetryUntilSuccessfulTest.groovy @@ -0,0 +1,155 @@ +package datadog.trace.civisibility.execution + +import datadog.trace.api.civisibility.execution.TestStatus +import datadog.trace.api.civisibility.telemetry.tag.RetryReason +import spock.lang.Specification + +import java.util.concurrent.atomic.AtomicInteger + +class RetryUntilSuccessfulTest extends Specification { + + def "test retry until successful"() { + setup: + def executionPolicy = new RetryUntilSuccessful(3, false, new AtomicInteger()) + + when: + def outcome = executionPolicy.registerExecution(TestStatus.fail, 0) + + then: + outcome.retryReason() == null + !outcome.lastExecution() + outcome.failureSuppressed() + !outcome.failedAllRetries() + !outcome.succeededAllRetries() + + when: + def outcome2 = executionPolicy.registerExecution(TestStatus.pass, 0) + + then: + outcome2.retryReason() == RetryReason.atr + outcome2.lastExecution() + !outcome2.failureSuppressed() + !outcome2.failedAllRetries() + !outcome2.succeededAllRetries() + } + + def "test fail all retries"() { + setup: + def executionPolicy = new RetryUntilSuccessful(3, false, new AtomicInteger()) + + when: + def outcome = executionPolicy.registerExecution(TestStatus.fail, 0) + + then: + outcome.retryReason() == null + !outcome.lastExecution() + outcome.failureSuppressed() + !outcome.failedAllRetries() + !outcome.succeededAllRetries() + + when: + def outcome2 = executionPolicy.registerExecution(TestStatus.fail, 0) + + then: + outcome2.retryReason() == RetryReason.atr + !outcome2.lastExecution() + outcome2.failureSuppressed() + !outcome2.failedAllRetries() + !outcome2.succeededAllRetries() + + when: + def outcome3 = executionPolicy.registerExecution(TestStatus.fail, 0) + + then: + outcome3.retryReason() == RetryReason.atr + outcome3.lastExecution() + !outcome3.failureSuppressed() + outcome3.failedAllRetries() + !outcome2.succeededAllRetries() + } + + def "test succeed on last try"() { + setup: + def executionPolicy = new RetryUntilSuccessful(3, false, new AtomicInteger()) + + when: + def outcome = executionPolicy.registerExecution(TestStatus.fail, 0) + + then: + outcome.retryReason() == null + !outcome.lastExecution() + outcome.failureSuppressed() + !outcome.failedAllRetries() + !outcome.succeededAllRetries() + + when: + def outcome2 = executionPolicy.registerExecution(TestStatus.fail, 0) + + then: + outcome2.retryReason() == RetryReason.atr + !outcome2.lastExecution() + outcome2.failureSuppressed() + !outcome2.failedAllRetries() + !outcome2.succeededAllRetries() + + when: + def outcome3 = executionPolicy.registerExecution(TestStatus.pass, 0) + + then: + outcome3.retryReason() == RetryReason.atr + outcome3.lastExecution() + !outcome3.failureSuppressed() + !outcome3.failedAllRetries() + !outcome2.succeededAllRetries() + } + + def "test succeed on first try"() { + setup: + def executionPolicy = new RetryUntilSuccessful(3, false, new AtomicInteger()) + + when: + def outcome = executionPolicy.registerExecution(TestStatus.pass, 0) + + then: + outcome.retryReason() == null + outcome.lastExecution() + !outcome.failureSuppressed() + !outcome.failedAllRetries() + !outcome.succeededAllRetries() + } + + def "test suppress failures"() { + setup: + def executionPolicy = new RetryUntilSuccessful(3, true, new AtomicInteger()) + + when: + def outcome = executionPolicy.registerExecution(TestStatus.fail, 0) + + then: + outcome.retryReason() == null + !outcome.lastExecution() + outcome.failureSuppressed() + !outcome.failedAllRetries() + !outcome.succeededAllRetries() + + when: + def outcome2 = executionPolicy.registerExecution(TestStatus.fail, 0) + + then: + outcome2.retryReason() == RetryReason.atr + !outcome2.lastExecution() + outcome2.failureSuppressed() + !outcome2.failedAllRetries() + !outcome2.succeededAllRetries() + + when: + def outcome3 = executionPolicy.registerExecution(TestStatus.fail, 0) + + then: + outcome3.retryReason() == RetryReason.atr + outcome3.lastExecution() + outcome3.failureSuppressed() + outcome3.failedAllRetries() + !outcome2.succeededAllRetries() + } +} diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/execution/RunNTimesTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/execution/RunNTimesTest.groovy new file mode 100644 index 00000000000..c08f9e85798 --- /dev/null +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/execution/RunNTimesTest.groovy @@ -0,0 +1,166 @@ +package datadog.trace.civisibility.execution + +import datadog.trace.api.civisibility.execution.TestStatus +import datadog.trace.api.civisibility.telemetry.tag.RetryReason +import datadog.trace.civisibility.config.ExecutionsByDuration +import spock.lang.Specification + +class RunNTimesTest extends Specification { + + def "test run N times"() { + setup: + def executionPolicy = new RunNTimes([new ExecutionsByDuration(Long.MAX_VALUE, 3)], false, RetryReason.efd) + + when: + def outcome = executionPolicy.registerExecution(TestStatus.fail, 0) + + then: + outcome.retryReason() == null + !outcome.lastExecution() + !outcome.failureSuppressed() + !outcome.failedAllRetries() + !outcome.succeededAllRetries() + + when: + def outcome2 = executionPolicy.registerExecution(TestStatus.pass, 0) + + then: + outcome2.retryReason() == RetryReason.efd + !outcome2.lastExecution() + !outcome2.failureSuppressed() + !outcome2.failedAllRetries() + !outcome2.succeededAllRetries() + + when: + def outcome3 = executionPolicy.registerExecution(TestStatus.fail, 0) + + then: + outcome3.retryReason() == RetryReason.efd + outcome3.lastExecution() + !outcome3.failureSuppressed() + !outcome3.failedAllRetries() + !outcome3.succeededAllRetries() + } + + def "test failed all retries"() { + setup: + def executionPolicy = new RunNTimes([new ExecutionsByDuration(Long.MAX_VALUE, 3)], false, RetryReason.efd) + + when: + def outcome = executionPolicy.registerExecution(TestStatus.fail, 0) + + then: + outcome.retryReason() == null + !outcome.lastExecution() + !outcome.failureSuppressed() + !outcome.failedAllRetries() + !outcome.succeededAllRetries() + + when: + def outcome2 = executionPolicy.registerExecution(TestStatus.fail, 0) + + then: + outcome2.retryReason() == RetryReason.efd + !outcome2.lastExecution() + !outcome2.failureSuppressed() + !outcome2.failedAllRetries() + !outcome2.succeededAllRetries() + + when: + def outcome3 = executionPolicy.registerExecution(TestStatus.fail, 0) + + then: + outcome3.retryReason() == RetryReason.efd + outcome3.lastExecution() + !outcome3.failureSuppressed() + outcome3.failedAllRetries() + !outcome3.succeededAllRetries() + } + + def "test succeeded all retries"() { + setup: + def executionPolicy = new RunNTimes([new ExecutionsByDuration(Long.MAX_VALUE, 3)], false, RetryReason.efd) + + when: + def outcome = executionPolicy.registerExecution(TestStatus.pass, 0) + + then: + outcome.retryReason() == null + !outcome.lastExecution() + !outcome.failureSuppressed() + !outcome.failedAllRetries() + !outcome.succeededAllRetries() + + when: + def outcome2 = executionPolicy.registerExecution(TestStatus.pass, 0) + + then: + outcome2.retryReason() == RetryReason.efd + !outcome2.lastExecution() + !outcome2.failureSuppressed() + !outcome2.failedAllRetries() + !outcome2.succeededAllRetries() + + when: + def outcome3 = executionPolicy.registerExecution(TestStatus.pass, 0) + + then: + outcome3.retryReason() == RetryReason.efd + outcome3.lastExecution() + !outcome3.failureSuppressed() + !outcome3.failedAllRetries() + outcome3.succeededAllRetries() + } + + def "test suppress failures"() { + setup: + def executionPolicy = new RunNTimes([new ExecutionsByDuration(Long.MAX_VALUE, 3)], true, RetryReason.attemptToFix) + + when: + def outcome = executionPolicy.registerExecution(TestStatus.fail, 0) + + then: + outcome.retryReason() == null + !outcome.lastExecution() + outcome.failureSuppressed() + !outcome.failedAllRetries() + !outcome.succeededAllRetries() + + when: + def outcome2 = executionPolicy.registerExecution(TestStatus.fail, 0) + + then: + outcome2.retryReason() == RetryReason.attemptToFix + !outcome2.lastExecution() + outcome2.failureSuppressed() + !outcome2.failedAllRetries() + !outcome2.succeededAllRetries() + + when: + def outcome3 = executionPolicy.registerExecution(TestStatus.fail, 0) + + then: + outcome3.retryReason() == RetryReason.attemptToFix + outcome3.lastExecution() + outcome3.failureSuppressed() + outcome3.failedAllRetries() + !outcome3.succeededAllRetries() + } + + def "test adaptive retry count"() { + when: + def executionPolicy = new RunNTimes([new ExecutionsByDuration(100, 3), new ExecutionsByDuration(Long.MAX_VALUE, 1)], true, RetryReason.efd) + + then: + !executionPolicy.registerExecution(TestStatus.fail, 0).lastExecution() + !executionPolicy.registerExecution(TestStatus.fail, 0).lastExecution() + executionPolicy.registerExecution(TestStatus.fail, 0).lastExecution() + + when: + executionPolicy = new RunNTimes([new ExecutionsByDuration(100, 3), new ExecutionsByDuration(Long.MAX_VALUE, 1)], true, RetryReason.efd) + + then: + !executionPolicy.registerExecution(TestStatus.fail, 0).lastExecution() + executionPolicy.registerExecution(TestStatus.fail, 101).lastExecution() // exceed duration, go from "3 retries" bracket to "1 retry" bracket + } +} diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/execution/RunOnceIgnoreOutcomeTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/execution/RunOnceIgnoreOutcomeTest.groovy new file mode 100644 index 00000000000..766301f9d92 --- /dev/null +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/execution/RunOnceIgnoreOutcomeTest.groovy @@ -0,0 +1,37 @@ +package datadog.trace.civisibility.execution + +import datadog.trace.api.civisibility.execution.TestStatus +import spock.lang.Specification + +class RunOnceIgnoreOutcomeTest extends Specification { + + def "test run once ignore outcome"() { + setup: + def executionPolicy = new RunOnceIgnoreOutcome() + + when: + def outcome = executionPolicy.registerExecution(TestStatus.pass, 0) + + then: + outcome.retryReason() == null + outcome.lastExecution() + !outcome.failureSuppressed() + !outcome.failedAllRetries() + !outcome.succeededAllRetries() + } + + def "test run once ignore outcome failed"() { + setup: + def executionPolicy = new RunOnceIgnoreOutcome() + + when: + def outcome = executionPolicy.registerExecution(TestStatus.fail, 0) + + then: + outcome.retryReason() == null + outcome.lastExecution() + outcome.failureSuppressed() + !outcome.failedAllRetries() + !outcome.succeededAllRetries() + } +} 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 a48842662ca..b1455fd8118 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 @@ -98,15 +98,24 @@ class ExecutionStrategyTest extends Specification { executionSettings.isKnownTestsDataAvailable() >> true executionSettings.isKnown(testFQN) >> false + when: def strategy = givenAnExecutionStrategy(executionSettings) def policy = strategy.executionPolicy(testID, TestSourceData.UNKNOWN, []) - // register one execution to get the retry reason - policy.registerExecution(TestStatus.pass, 0) - - expect: + then: policy.class == RunNTimes - policy.currentExecutionRetryReason() == RetryReason.attemptToFix + + when: + def outcome = policy.registerExecution(TestStatus.pass, 0) + + then: + outcome.retryReason() == null // first execution is not a retry + + when: + def secondOutcome = policy.registerExecution(TestStatus.pass, 0) + + then: + secondOutcome.retryReason() == RetryReason.attemptToFix } private ExecutionStrategy givenAnExecutionStrategy(ExecutionSettings executionSettings = ExecutionSettings.EMPTY) { 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 4f31bd06c53..808daeb9ba3 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 @@ -85,8 +85,7 @@ public void testStarted(final Description description) { null, categories, TestSourceData.UNKNOWN, - null, - executionHistories.get(description)); + null); recordFeatureFileCodeCoverage(description); } 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 3cec47ee1af..c51d7abb7b0 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 @@ -118,7 +118,7 @@ public static Boolean execute( runPickle.invokeWithArguments(featureRunner, pickleRunner, failureSuppressingNotifier); } catch (Throwable ignored) { } - } while (!executionPolicy.wasLastExecution()); + } while (executionPolicy.applicable()); // skip original method return Boolean.TRUE; 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 7e8b8651ca9..b5c716f572d 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 @@ -87,8 +87,7 @@ public void testStarted(final Description description) { null, categories, JUnit4Utils.toTestSourceData(description), - null, - executionHistories.get(description)); + null); } @Override @@ -174,7 +173,6 @@ public void testIgnored(final Description description) { null, categories, JUnit4Utils.toTestSourceData(description), - null, null); } TestEventsHandlerHolder.HANDLERS 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 a722e20b3cb..a5dae830aa8 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 @@ -115,7 +115,7 @@ public static Future apply( result = (Future) runTest.invoke(runner, failureSuppressingNotifier, test); } catch (Throwable ignored) { } - } while (!executionPolicy.wasLastExecution()); + } while (executionPolicy.applicable()); // skip original method return result; 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 d50f4fadf4c..e9191a01ad6 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 @@ -89,8 +89,7 @@ public void testStarted(final Description description) { testParameters, categories, testSourceData, - null, - executionHistories.get(description)); + null); } @Override 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 2f356a2d7b9..b6b26a9d880 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 @@ -124,7 +124,7 @@ public static Boolean apply( runTest.invoke(runner, statement, description, failureSuppressingNotifier); } catch (Throwable ignored) { } - } while (!executionPolicy.wasLastExecution()); + } while (executionPolicy.applicable()); // skip original method return Boolean.TRUE; 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 b6729a25612..83e6389fc4b 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 @@ -77,15 +77,15 @@ class JUnit4Test extends CiVisibilityInstrumentationTest { where: testcaseName | success | tests | retriedTests - "test-failed" | false | [TestFailed] | [] + // "test-failed" | false | [TestFailed] | [] "test-retry-failed" | false | [TestFailed] | [new TestFQN("org.example.TestFailed", "test_failed")] - "test-failed-then-succeed" | true | [TestFailedThenSucceed] | [new TestFQN("org.example.TestFailedThenSucceed", "test_failed_then_succeed")] - "test-assumption-is-not-retried" | true | [TestAssumption] | [new TestFQN("org.example.TestAssumption", "test_fail_assumption")] - "test-skipped-is-not-retried" | true | [TestSkipped] | [new TestFQN("org.example.TestSkipped", "test_skipped")] - "test-retry-parameterized" | false | [TestFailedParameterized] | [ - new TestFQN("org.example.TestFailedParameterized", "test_failed_parameterized") /* backend cannot provide parameters for flaky parameterized tests yet */ - ] - "test-expected-exception-is-not-retried" | true | [TestSucceedExpectedException] | [new TestFQN("org.example.TestSucceedExpectedException", "test_succeed")] + // "test-failed-then-succeed" | true | [TestFailedThenSucceed] | [new TestFQN("org.example.TestFailedThenSucceed", "test_failed_then_succeed")] + // "test-assumption-is-not-retried" | true | [TestAssumption] | [new TestFQN("org.example.TestAssumption", "test_fail_assumption")] + // "test-skipped-is-not-retried" | true | [TestSkipped] | [new TestFQN("org.example.TestSkipped", "test_skipped")] + // "test-retry-parameterized" | false | [TestFailedParameterized] | [ + // new TestFQN("org.example.TestFailedParameterized", "test_failed_parameterized") /* backend cannot provide parameters for flaky parameterized tests yet */ + // ] + // "test-expected-exception-is-not-retried" | true | [TestSucceedExpectedException] | [new TestFQN("org.example.TestSucceedExpectedException", "test_succeed")] } def "test early flakiness detection #testcaseName"() { 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 ce8daeb90e4..c7e9859fe85 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 @@ -133,8 +133,7 @@ private void testResourceExecutionStarted( null, tags, TestSourceData.UNKNOWN, - null, - TestEventsHandlerHolder.getExecutionHistory(testDescriptor)); + null); CoveragePerTestBridge.recordCoverage(classpathResourceName); } 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 f88cf5c5852..f365dc7b3b2 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 @@ -134,8 +134,7 @@ private void testMethodExecutionStarted(TestDescriptor testDescriptor, MethodSou testParameters, tags, testSourceData, - null, - TestEventsHandlerHolder.getExecutionHistory(testDescriptor)); + null); } private void testCaseExecutionFinished( 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 8f4f693fc7e..6287b8a8ed5 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 @@ -134,8 +134,7 @@ private void testMethodExecutionStarted(TestDescriptor testDescriptor, MethodSou testParameters, tags, testSourceData, - null, - TestEventsHandlerHolder.getExecutionHistory(testDescriptor)); + null); } private void testCaseExecutionFinished( 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 3f22d470a9c..342e53c79dd 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 @@ -169,7 +169,7 @@ public static Boolean execute(@Advice.This HierarchicalTestExecutorService.TestT factory.setSuppressFailures(false); // restore default behavior - if (executionPolicy.wasLastExecution()) { + if (!executionPolicy.applicable()) { break; } 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 83656a22f8c..52638fab4a5 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 @@ -108,7 +108,7 @@ public static void afterExecute(@Advice.This ScenarioRuntime scenarioRuntime) { ScenarioResult finalResult = scenarioRuntime.result; TestExecutionPolicy executionPolicy = context.getExecutionPolicy(); - while (!executionPolicy.wasLastExecution()) { + while (executionPolicy.applicable()) { ScenarioRuntime retry = new ScenarioRuntime(scenarioRuntime.featureRuntime, scenarioRuntime.scenario); retry.magicVariables.put(KarateUtils.EXECUTION_HISTORY_MAGICVARIABLE, executionPolicy); 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 f400c2a8c0f..fa16308d232 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 @@ -147,8 +147,7 @@ public boolean beforeScenario(ScenarioRuntime sr) { parameters, categories, TestSourceData.UNKNOWN, - null, - (TestExecutionHistory) sr.magicVariables.get(KarateUtils.EXECUTION_HISTORY_MAGICVARIABLE)); + null); return true; } diff --git a/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/DatadogReporter.java b/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/DatadogReporter.java index c3e3b98a713..e454ad0513d 100644 --- a/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/DatadogReporter.java +++ b/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/DatadogReporter.java @@ -169,8 +169,7 @@ private static void onTestStart(TestStarting event) { testParameters, categories, new TestSourceData(testClass, null, null), - null, - context.getExecutionHistory(testIdentifier)); + null); } private static void onTestSuccess(TestSucceeded event) { diff --git a/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/execution/ScalatestExecutionInstrumentation.java b/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/execution/ScalatestExecutionInstrumentation.java index 187caa69b2d..36754aa9e8b 100644 --- a/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/execution/ScalatestExecutionInstrumentation.java +++ b/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/execution/ScalatestExecutionInstrumentation.java @@ -107,7 +107,7 @@ public static void afterTest( @Advice.Return(readOnly = false) Status status) throws Throwable { TestExecutionWrapper invokeWrapper = (TestExecutionWrapper) invokeWithFixture; - if (!invokeWrapper.wasLastExecution()) { + if (invokeWrapper.applicable()) { status = (Status) runTest.invokeWithArguments( diff --git a/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/execution/TestExecutionWrapper.java b/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/execution/TestExecutionWrapper.java index c2aeb2839af..af366582437 100644 --- a/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/execution/TestExecutionWrapper.java +++ b/dd-java-agent/instrumentation/scalatest/src/main/java/datadog/trace/instrumentation/scalatest/execution/TestExecutionWrapper.java @@ -31,7 +31,7 @@ public Outcome apply(SuperEngine.TestLeaf testLeaf) { return outcome; } - public boolean wasLastExecution() { - return executionPolicy.wasLastExecution(); + public boolean applicable() { + return executionPolicy.applicable(); } } diff --git a/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TracingListener.java b/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TracingListener.java index 6b131b2f250..eeefac8c484 100644 --- a/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TracingListener.java +++ b/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/TracingListener.java @@ -92,8 +92,7 @@ public void onTestStart(final ITestResult result) { testParameters, groups, testSourceData, - null, - executionHistory(result)); + null); } @Nullable diff --git a/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/execution/RetryAnalyzer.java b/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/execution/RetryAnalyzer.java index b8459ad36db..64ccef3700e 100644 --- a/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/execution/RetryAnalyzer.java +++ b/dd-java-agent/instrumentation/testng/src/main/java/datadog/trace/instrumentation/testng/execution/RetryAnalyzer.java @@ -36,7 +36,7 @@ public boolean retry(ITestResult result) { return false; } createExecutionPolicy(result); - return !executionPolicy.wasLastExecution(); + return executionPolicy.applicable(); } public void setSuppressFailures(ITestResult result) { 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 2873c97a84a..037b437b347 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 @@ -113,8 +113,7 @@ public static void onTestFinished(TestFinished event, TaskDef taskDef) { testParameters, categories, new TestSourceData(testClass, testMethod, testMethodName), - startMicros, - executionHistory); + startMicros); if (testOutcome.result() instanceof Result.Ignored) { Result.Ignored result = (Result.Ignored) testOutcome.result(); 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 869b8f6cc9b..6bfaf642857 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 @@ -54,7 +54,6 @@ void onTestSuiteStart( * @param categories test categories (or test tags) if the test case is marked with any * @param testSourceData metadata for locating the source code for the test case * @param startTime the timestamp of the test execution start ({@code null} for current timestamp) - * @param testExecutionHistory the history of executions of this test case */ void onTestStart( SuiteKey suiteDescriptor, @@ -65,8 +64,7 @@ void onTestStart( @Nullable String testParameters, @Nullable Collection categories, @Nonnull TestSourceData testSourceData, - @Nullable Long startTime, - @Nullable TestExecutionHistory testExecutionHistory); + @Nullable Long startTime); void onTestSkip(TestKey descriptor, @Nullable String reason); diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/execution/TestExecutionHistory.java b/internal-api/src/main/java/datadog/trace/api/civisibility/execution/TestExecutionHistory.java index e97aa2b458c..55b31d5785c 100644 --- a/internal-api/src/main/java/datadog/trace/api/civisibility/execution/TestExecutionHistory.java +++ b/internal-api/src/main/java/datadog/trace/api/civisibility/execution/TestExecutionHistory.java @@ -9,30 +9,35 @@ public interface TestExecutionHistory { * @param status result of the execution: pass, fail or skip * @param durationMillis duration of current test execution in milliseconds */ - void registerExecution(TestStatus status, long durationMillis); + ExecutionOutcome registerExecution(TestStatus status, long durationMillis); - /** - * @return {@code true} if the last execution registered was the last one (only for policies that - * allow multiple retries) - */ - boolean wasLastExecution(); + interface ExecutionOutcome { + /** @return {@code true} if this execution failed and the failure was suppressed */ + boolean failureSuppressed(); - /** - * @return retry reason for current test execution ({@code null} if current execution is not a - * retry) - */ - @Nullable - RetryReason currentExecutionRetryReason(); + /** + * @return {@code true} if this execution is the last one (only for policies that allow multiple + * retries) + */ + boolean lastExecution(); - /** - * @return {@code true} if the test has failed all retry attempts (only for policies that allow - * multiple retries) - */ - boolean hasFailedAllRetries(); + /** + * @return {@code true} if the test has failed all retry attempts (only for policies that allow + * multiple retries) + */ + boolean failedAllRetries(); - /** - * @return {@code true} if the test has succeeded all retry attempts (only for policies that allow - * multiple retries) - */ - boolean hasSucceededAllRetries(); + /** + * @return {@code true} if the test has succeeded all retry attempts (only for policies that + * allow multiple retries) + */ + boolean succeededAllRetries(); + + /** + * @return retry reason for current test execution ({@code null} if current execution is not a + * retry) + */ + @Nullable + RetryReason retryReason(); + } } diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/Tags.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/Tags.java index c4bf7527906..1504c19f80b 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/Tags.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/Tags.java @@ -97,6 +97,7 @@ public class Tags { public static final String TEST_RETRY_REASON = "test.retry_reason"; public static final String TEST_IS_MODIFIED = "test.is_modified"; public static final String TEST_HAS_FAILED_ALL_RETRIES = "test.has_failed_all_retries"; + public static final String TEST_FAILURE_SUPPRESSED = "test.failure_suppressed"; public static final String TEST_TEST_MANAGEMENT_ENABLED = "test.test_management.enabled"; public static final String TEST_TEST_MANAGEMENT_IS_QUARANTINED = "test.test_management.is_quarantined"; From 5d9d4769555fdef0389a7a9463fa608d8cba24d2 Mon Sep 17 00:00:00 2001 From: Nikita Tkachenko Date: Fri, 5 Sep 2025 17:47:32 +0200 Subject: [PATCH 2/3] Add test.failure_suppressed tag --- .../trace/civisibility/events/TestEventsHandlerImpl.java | 4 ++++ .../test-attempt-to-fix-disabled-failed/events.ftl | 5 +++++ .../test-attempt-to-fix-quarantined-failed/events.ftl | 5 +++++ .../test/resources/test-quarantined-failed-atr/events.ftl | 5 +++++ .../test/resources/test-quarantined-failed-efd/events.ftl | 3 +++ .../resources/test-quarantined-failed-known/events.ftl | 1 + .../src/test/resources/test-quarantined-failed/events.ftl | 1 + .../src/test/resources/test-retry-failure/events.ftl | 4 ++++ .../test-retry-scenario-outline-5.4.0/events.ftl | 4 ++++ .../test-attempt-to-fix-disabled-failed/events.ftl | 5 +++++ .../test-attempt-to-fix-quarantined-failed/events.ftl | 5 +++++ .../test/resources/test-failed-then-succeed/events.ftl | 2 ++ .../test/resources/test-quarantined-failed-atr/events.ftl | 5 +++++ .../test/resources/test-quarantined-failed-efd/events.ftl | 3 +++ .../resources/test-quarantined-failed-known/events.ftl | 1 + .../src/test/resources/test-quarantined-failed/events.ftl | 1 + .../src/test/resources/test-retry-failed/events.ftl | 4 ++++ .../test-attempt-to-fix-disabled-failed/events.ftl | 5 +++++ .../test-attempt-to-fix-quarantined-failed/events.ftl | 5 +++++ .../test/resources/test-quarantined-failed-atr/events.ftl | 5 +++++ .../test/resources/test-quarantined-failed-efd/events.ftl | 3 +++ .../resources/test-quarantined-failed-known/events.ftl | 1 + .../test-quarantined-failed-parameterized/events.ftl | 1 + .../src/test/resources/test-quarantined-failed/events.ftl | 1 + .../src/test/resources/test-retry-failed/events.ftl | 4 ++++ .../test-attempt-to-fix-disabled-failed/events.ftl | 5 +++++ .../test-attempt-to-fix-quarantined-failed/events.ftl | 5 +++++ .../test/resources/test-failed-then-succeed/events.ftl | 2 ++ .../test/resources/test-quarantined-failed-atr/events.ftl | 5 +++++ .../test/resources/test-quarantined-failed-efd/events.ftl | 3 +++ .../resources/test-quarantined-failed-known/events.ftl | 1 + .../src/test/resources/test-quarantined-failed/events.ftl | 1 + .../test-retry-failed-scenario-outline-5.4.0/events.ftl | 4 ++++ .../test-retry-failed-scenario-outline-latest/events.ftl | 4 ++++ .../src/test/resources/test-retry-failed/events.ftl | 4 ++++ .../test-attempt-to-fix-disabled-failed/events.ftl | 5 +++++ .../test-attempt-to-fix-quarantined-failed/events.ftl | 5 +++++ .../test/resources/test-failed-then-succeed/events.ftl | 3 +++ .../test-parameterized-failed-then-succeed/events.ftl | 2 ++ .../test/resources/test-quarantined-failed-atr/events.ftl | 5 +++++ .../test/resources/test-quarantined-failed-efd/events.ftl | 3 +++ .../resources/test-quarantined-failed-known/events.ftl | 1 + .../test-quarantined-failed-parameterized/events.ftl | 1 + .../src/test/resources/test-quarantined-failed/events.ftl | 1 + .../src/test/resources/test-retry-failed/events.ftl | 4 ++++ .../test/resources/test-retry-parameterized/events.ftl | 4 ++++ .../test-attempt-to-fix-disabled-failed/events.ftl | 5 +++++ .../test-attempt-to-fix-quarantined-failed/events.ftl | 5 +++++ .../test/resources/test-failed-then-succeed/events.ftl | 3 +++ .../test/resources/test-quarantined-failed-atr/events.ftl | 5 +++++ .../test/resources/test-quarantined-failed-efd/events.ftl | 3 +++ .../resources/test-quarantined-failed-known/events.ftl | 1 + .../test-quarantined-failed-parameterized/events.ftl | 2 ++ .../src/test/resources/test-quarantined-failed/events.ftl | 1 + .../src/test/resources/test-retry-factory/events.ftl | 4 ++++ .../src/test/resources/test-retry-failed/events.ftl | 4 ++++ .../test/resources/test-retry-parameterized/events.ftl | 8 ++++++++ .../src/test/resources/test-retry-template/events.ftl | 4 ++++ .../test-attempt-to-fix-disabled-failed/events.ftl | 5 +++++ .../test-attempt-to-fix-quarantined-failed/events.ftl | 5 +++++ .../test/resources/test-failed-then-succeed/events.ftl | 2 ++ .../test/resources/test-quarantined-failed-atr/events.ftl | 5 +++++ .../test/resources/test-quarantined-failed-efd/events.ftl | 3 +++ .../resources/test-quarantined-failed-known/events.ftl | 1 + .../src/test/resources/test-quarantined-failed/events.ftl | 1 + .../src/test/resources/test-retry-failed/events.ftl | 4 ++++ .../test/resources/test-retry-parameterized/events.ftl | 4 ++++ .../test-attempt-to-fix-disabled-failed/events.ftl | 5 +++++ .../test-attempt-to-fix-quarantined-failed/events.ftl | 5 +++++ .../test/resources/test-failed-then-succeed/events.ftl | 2 ++ .../test/resources/test-quarantined-failed-atr/events.ftl | 5 +++++ .../test/resources/test-quarantined-failed-efd/events.ftl | 3 +++ .../resources/test-quarantined-failed-known/events.ftl | 1 + .../src/test/resources/test-quarantined-failed/events.ftl | 1 + .../src/test/resources/test-retry-failed/events.ftl | 4 ++++ .../test/resources/test-retry-parameterized/events.ftl | 4 ++++ .../test-attempt-to-fix-disabled-failed/events.ftl | 5 +++++ .../test-attempt-to-fix-quarantined-failed/events.ftl | 5 +++++ .../test/resources/test-failed-then-succeed/events.ftl | 2 ++ .../test/resources/test-quarantined-failed-atr/events.ftl | 5 +++++ .../test/resources/test-quarantined-failed-efd/events.ftl | 3 +++ .../resources/test-quarantined-failed-known/events.ftl | 1 + .../test-quarantined-failed-parameterized/events.ftl | 1 + .../src/test/resources/test-quarantined-failed/events.ftl | 1 + .../src/test/resources/test-retry-error/events.ftl | 4 ++++ .../src/test/resources/test-retry-failed/events.ftl | 4 ++++ .../test/resources/test-retry-parameterized/events.ftl | 4 ++++ .../test/resources/test-failed-flaky-retries/events.ftl | 6 +++++- .../test_failed_maven_run_flaky_retries/events.ftl | 6 +++++- .../test_successful_maven_run_test_management/events.ftl | 6 ++++++ 90 files changed, 307 insertions(+), 2 deletions(-) diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestEventsHandlerImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestEventsHandlerImpl.java index ae1a94f4c3d..2b88185000e 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestEventsHandlerImpl.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/events/TestEventsHandlerImpl.java @@ -264,6 +264,10 @@ public void onTestFinish( if (outcome.lastExecution() && testModule.isAttemptToFix(test.getIdentifier())) { test.setTag(Tags.TEST_TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED, outcome.succeededAllRetries()); } + + if (outcome.failureSuppressed()) { + test.setTag(Tags.TEST_FAILURE_SUPPRESSED, true); + } } test.end(endTime); 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 c70c4e06623..df3808256c7 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 @@ -47,6 +47,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-4", @@ -95,6 +96,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -145,6 +147,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -195,6 +198,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -245,6 +249,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.has_failed_all_retries" : "true", 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 b1c5623653a..1552e19c058 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 @@ -47,6 +47,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-4", @@ -95,6 +96,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -145,6 +147,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -195,6 +198,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -245,6 +249,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.has_failed_all_retries" : "true", 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 ecf29315112..c4d2d186cc3 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 @@ -47,6 +47,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-4", @@ -94,6 +95,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -143,6 +145,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -192,6 +195,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -241,6 +245,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.has_failed_all_retries" : "true", 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 9dbed6f2f67..69a1aee8c28 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 @@ -47,6 +47,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_new" : "true", @@ -95,6 +96,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_new" : "true", @@ -145,6 +147,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.has_failed_all_retries" : "true", 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 e79c800340e..e9ffd0f95b0 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 @@ -47,6 +47,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-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 65dbb7bdb6e..6bf52d090de 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 @@ -47,6 +47,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-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 81aa567fcb6..f5f32f6464c 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 @@ -47,6 +47,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-4", @@ -93,6 +94,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -141,6 +143,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -189,6 +192,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", 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 8f3a77dd0eb..95218dec2e6 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 @@ -133,6 +133,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-4", @@ -179,6 +180,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -227,6 +229,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -275,6 +278,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", 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 275963b4388..18b640078eb 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 @@ -120,6 +120,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "munit-junit-4", @@ -170,6 +171,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -222,6 +224,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -274,6 +277,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -326,6 +330,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, "test.has_failed_all_retries" : "true", 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 309ff4bd5bf..d662a0a204d 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 @@ -120,6 +120,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "munit-junit-4", @@ -170,6 +171,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -222,6 +224,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -274,6 +277,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -326,6 +330,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, "test.has_failed_all_retries" : "true", 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 8f8686406ce..23256fae70a 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 @@ -118,6 +118,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "munit-junit-4", @@ -166,6 +167,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", 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 36536ca2172..8b9d466adad 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 @@ -120,6 +120,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "munit-junit-4", @@ -169,6 +170,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -220,6 +222,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -271,6 +274,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -322,6 +326,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, "test.has_failed_all_retries" : "true", 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 bf17700030e..6c7a2782dd6 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 @@ -122,6 +122,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_new" : "true", @@ -172,6 +173,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_new" : "true", @@ -224,6 +226,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, "test.has_failed_all_retries" : "true", 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 5cc2916c4c9..4469e347e72 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 @@ -122,6 +122,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "munit-junit-4", 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 31324d609f7..12ef39d8a90 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 @@ -120,6 +120,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "munit-junit-4", 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 54d628eefa6..0be6c03e3e4 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 @@ -118,6 +118,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "munit-junit-4", @@ -166,6 +167,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -216,6 +218,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -266,6 +269,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", 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 4e386dd4db1..088bb62c864 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 @@ -119,6 +119,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-4.10", @@ -170,6 +171,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -223,6 +225,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -276,6 +279,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -329,6 +333,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.has_failed_all_retries" : "true", 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 f821eb84bf3..74bbe5d31b2 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 @@ -119,6 +119,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-4.10", @@ -170,6 +171,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -223,6 +225,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -276,6 +279,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -329,6 +333,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.has_failed_all_retries" : "true", 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 72c90b9448d..7ab7ce11e1e 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 @@ -119,6 +119,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-4.10", @@ -169,6 +170,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -221,6 +223,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -273,6 +276,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -325,6 +329,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.has_failed_all_retries" : "true", 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 758b9c2c656..e3d7e4108ce 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 @@ -121,6 +121,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_new" : "true", @@ -172,6 +173,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_new" : "true", @@ -225,6 +227,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.has_failed_all_retries" : "true", 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 7d409ad2c0d..5c17cffa2ba 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 @@ -121,6 +121,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-4.10", 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 c04408d2f7b..b42aa06d939 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 @@ -120,6 +120,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-4.10", 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 025d821ae88..c5943e7d5c2 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 @@ -119,6 +119,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-4.10", 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 7dc9816ef55..dd5919d3daf 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 @@ -117,6 +117,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-4.10", @@ -166,6 +167,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -217,6 +219,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -268,6 +271,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", 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 00b3ec7e618..99a42742d3f 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 @@ -47,6 +47,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-5", @@ -95,6 +96,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -145,6 +147,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -195,6 +198,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -245,6 +249,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.has_failed_all_retries" : "true", 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 dfeb0864424..1d8611c28e9 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 @@ -47,6 +47,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-5", @@ -95,6 +96,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -145,6 +147,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -195,6 +198,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -245,6 +249,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.has_failed_all_retries" : "true", 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 d1bcf0eb03f..63f96216a34 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 @@ -47,6 +47,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-5", @@ -93,6 +94,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", 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 8c97839cbeb..475eea18531 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 @@ -47,6 +47,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-5", @@ -94,6 +95,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -143,6 +145,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -192,6 +195,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -241,6 +245,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.has_failed_all_retries" : "true", 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 ea8ea2e5230..3be488d87b3 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 @@ -47,6 +47,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_new" : "true", @@ -95,6 +96,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_new" : "true", @@ -145,6 +147,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.has_failed_all_retries" : "true", 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 4240f4bb83b..9769a2e53a2 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 @@ -47,6 +47,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-5", 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 49aaf589111..41716dc364d 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 @@ -47,6 +47,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-5", 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 906bbc448ec..c63f6e11200 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 @@ -47,6 +47,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-5", @@ -93,6 +94,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -141,6 +143,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -189,6 +192,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", 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 ac68810e776..f3f7dbc0326 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 @@ -47,6 +47,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-5", @@ -93,6 +94,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -141,6 +143,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -189,6 +192,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", 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 f0274ae5cd5..82befc7ff31 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 @@ -47,6 +47,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-5", @@ -93,6 +94,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -141,6 +143,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -189,6 +192,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", 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 21c32d42563..08369c35320 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 @@ -52,6 +52,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "spock-junit-5", @@ -104,6 +105,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -158,6 +160,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -212,6 +215,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -266,6 +270,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.has_failed_all_retries" : "true", 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 fb7e10b5e82..64cb72fddd4 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 @@ -52,6 +52,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "spock-junit-5", @@ -104,6 +105,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -158,6 +160,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -212,6 +215,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -266,6 +270,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.has_failed_all_retries" : "true", 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 88d21821bdf..876990e534a 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 @@ -52,6 +52,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "spock-junit-5", @@ -102,6 +103,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -154,6 +156,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", diff --git a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-parameterized-failed-then-succeed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-parameterized-failed-then-succeed/events.ftl index 775a5f35516..def72743359 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 @@ -52,6 +52,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "spock-junit-5", @@ -103,6 +104,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", 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 469ab00743d..6fe993c9748 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 @@ -52,6 +52,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "spock-junit-5", @@ -103,6 +104,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -156,6 +158,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -209,6 +212,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -262,6 +266,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.has_failed_all_retries" : "true", 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 b9e3e4fb203..41bed5164f3 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 @@ -52,6 +52,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_new" : "true", @@ -104,6 +105,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_new" : "true", @@ -158,6 +160,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.has_failed_all_retries" : "true", 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 aa93a974bd0..1c445c72f97 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 @@ -52,6 +52,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "spock-junit-5", 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 0c996f37685..06c062d0780 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 @@ -100,6 +100,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "spock-junit-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 669be20b0e8..d42a4a88ffb 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 @@ -52,6 +52,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "spock-junit-5", 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 585abb8f360..2ef176b2c02 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 @@ -52,6 +52,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "spock-junit-5", @@ -102,6 +103,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -154,6 +156,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -206,6 +209,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", 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 06f32612c39..ce5502a4921 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 @@ -100,6 +100,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "spock-junit-5", @@ -151,6 +152,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -204,6 +206,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -257,6 +260,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", 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 bfc49d795dc..358a066270f 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 @@ -120,6 +120,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-5.3", @@ -172,6 +173,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -226,6 +228,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -280,6 +283,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -334,6 +338,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.has_failed_all_retries" : "true", 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 13a34b883e3..810fcc3d2ae 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 @@ -120,6 +120,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-5.3", @@ -172,6 +173,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -226,6 +228,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -280,6 +283,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -334,6 +338,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.has_failed_all_retries" : "true", 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 330170ec194..febe49f17d0 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 @@ -118,6 +118,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-5.3", @@ -168,6 +169,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -220,6 +222,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", 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 cc509701a25..9d2c608a418 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 @@ -120,6 +120,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-5.3", @@ -171,6 +172,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -224,6 +226,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -277,6 +280,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -330,6 +334,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.has_failed_all_retries" : "true", 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 aa06a0aa13f..41b1dfc868f 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 @@ -122,6 +122,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_new" : "true", @@ -174,6 +175,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_new" : "true", @@ -228,6 +230,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.has_failed_all_retries" : "true", 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 794781bfddf..571898d8e2f 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 @@ -122,6 +122,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-5.3", 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 a14cd5c6a8d..2b1ae540591 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 @@ -120,6 +120,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-5.3", @@ -172,6 +173,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-5.3", 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 a838ab81f5d..7ab3ed1fd74 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 @@ -120,6 +120,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-5.3", 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 3b34592b5e1..51b2ae3d995 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 @@ -165,6 +165,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-5.3", @@ -215,6 +216,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -267,6 +269,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -319,6 +322,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-failed/events.ftl index c883a01ab2b..63f4ba4ac4e 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 @@ -118,6 +118,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-5.3", @@ -168,6 +169,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -220,6 +222,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -272,6 +275,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-parameterized/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-parameterized/events.ftl index 0fe83fb347b..101386b5d2a 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 @@ -118,6 +118,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-5.3", @@ -169,6 +170,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -222,6 +224,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -275,6 +278,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -382,6 +386,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-5.3", @@ -433,6 +438,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -486,6 +492,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -539,6 +546,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", diff --git a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-template/events.ftl b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-retry-template/events.ftl index 907ad29b08a..1cd87476b43 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 @@ -118,6 +118,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-5.3", @@ -169,6 +170,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -222,6 +224,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -275,6 +278,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl index 53ff10bfa3e..7df8e557e84 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl @@ -233,6 +233,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "karate", @@ -280,6 +281,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -329,6 +331,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -378,6 +381,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -427,6 +431,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.has_failed_all_retries" : "true", diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl index 0d31dbe41dc..592fc25cf2d 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl @@ -233,6 +233,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "karate", @@ -280,6 +281,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -329,6 +331,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -378,6 +381,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -427,6 +431,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.has_failed_all_retries" : "true", diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-failed-then-succeed/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-failed-then-succeed/events.ftl index 787ee8b56c6..fc83695d13c 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-failed-then-succeed/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-failed-then-succeed/events.ftl @@ -119,6 +119,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "karate", @@ -164,6 +165,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-quarantined-failed-atr/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-quarantined-failed-atr/events.ftl index c419a3e39ca..35779b8dcee 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-quarantined-failed-atr/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-quarantined-failed-atr/events.ftl @@ -233,6 +233,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "karate", @@ -279,6 +280,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -327,6 +329,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -375,6 +378,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -423,6 +427,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.has_failed_all_retries" : "true", diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-quarantined-failed-efd/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-quarantined-failed-efd/events.ftl index a582dd95f1d..b1a4a446421 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-quarantined-failed-efd/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-quarantined-failed-efd/events.ftl @@ -324,6 +324,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_new" : "true", @@ -371,6 +372,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_new" : "true", @@ -420,6 +422,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.has_failed_all_retries" : "true", diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-quarantined-failed-known/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-quarantined-failed-known/events.ftl index 5d28491d13e..2976254d80b 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-quarantined-failed-known/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-quarantined-failed-known/events.ftl @@ -276,6 +276,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "karate", diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-quarantined-failed/events.ftl index 8b8eef8a86b..123f6b283e3 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-quarantined-failed/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-quarantined-failed/events.ftl @@ -137,6 +137,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "karate", diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-retry-failed/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-retry-failed/events.ftl index fea957f0548..d7137fb5604 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-retry-failed/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-retry-failed/events.ftl @@ -236,6 +236,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "karate", @@ -281,6 +282,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -328,6 +330,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -375,6 +378,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-retry-parameterized/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-retry-parameterized/events.ftl index bd80539db25..994c2b01e7f 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-retry-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-retry-parameterized/events.ftl @@ -482,6 +482,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "karate", @@ -528,6 +529,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -576,6 +578,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -624,6 +627,7 @@ "library_version" : ${content_meta_library_version}, "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl index 65f5b094476..7a284fd6f9d 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl +++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl @@ -52,6 +52,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "scalatest", @@ -101,6 +102,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -152,6 +154,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -203,6 +206,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -254,6 +258,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.has_failed_all_retries" : "true", diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl index d6c7ebbeaae..90ad1610e47 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl +++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl @@ -52,6 +52,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "scalatest", @@ -101,6 +102,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -152,6 +154,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -203,6 +206,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -254,6 +258,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.has_failed_all_retries" : "true", diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-failed-then-succeed/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-failed-then-succeed/events.ftl index 2804f20b92f..72a1be1d3bc 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-failed-then-succeed/events.ftl +++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-failed-then-succeed/events.ftl @@ -52,6 +52,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "scalatest", @@ -99,6 +100,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed-atr/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed-atr/events.ftl index dfb03aee9e7..2d9fcacb2d0 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed-atr/events.ftl +++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed-atr/events.ftl @@ -52,6 +52,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "scalatest", @@ -100,6 +101,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -150,6 +152,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -200,6 +203,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -250,6 +254,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.has_failed_all_retries" : "true", diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed-efd/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed-efd/events.ftl index 76289238ef9..d6fa969fc85 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed-efd/events.ftl +++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed-efd/events.ftl @@ -52,6 +52,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_new" : "true", @@ -101,6 +102,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_new" : "true", @@ -152,6 +154,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.has_failed_all_retries" : "true", diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed-known/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed-known/events.ftl index 953ebd8155f..25c73ba1567 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed-known/events.ftl +++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed-known/events.ftl @@ -52,6 +52,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "scalatest", diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed/events.ftl index 9df71b1598b..cd3e6d382e2 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed/events.ftl +++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed/events.ftl @@ -52,6 +52,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "scalatest", diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-retry-failed/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-retry-failed/events.ftl index fde9b5d172a..7e05549b3fb 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-retry-failed/events.ftl +++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-retry-failed/events.ftl @@ -52,6 +52,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "scalatest", @@ -99,6 +100,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -148,6 +150,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -197,6 +200,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-retry-parameterized/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-retry-parameterized/events.ftl index e084d9b76fe..1923396dd08 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-retry-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-retry-parameterized/events.ftl @@ -52,6 +52,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "scalatest", @@ -99,6 +100,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -148,6 +150,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -197,6 +200,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl index 6118a0f30f0..06335ed589f 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl @@ -52,6 +52,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "testng-7", @@ -104,6 +105,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -158,6 +160,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -212,6 +215,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -266,6 +270,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.has_failed_all_retries" : "true", diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl index 48e9047ccaa..a21ea4d7431 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl @@ -52,6 +52,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "testng-7", @@ -104,6 +105,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -158,6 +160,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -212,6 +215,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -266,6 +270,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.has_failed_all_retries" : "true", diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-then-succeed/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-then-succeed/events.ftl index fa40dfc6719..dc84ac43595 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-then-succeed/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-then-succeed/events.ftl @@ -52,6 +52,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "testng-7", @@ -102,6 +103,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-atr/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-atr/events.ftl index b75428eb649..bbf41dc65cd 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-atr/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-atr/events.ftl @@ -52,6 +52,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "testng-7", @@ -103,6 +104,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -156,6 +158,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -209,6 +212,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -262,6 +266,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.has_failed_all_retries" : "true", diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-efd/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-efd/events.ftl index fed9e4ec567..b3cd46f6d14 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-efd/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-efd/events.ftl @@ -52,6 +52,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_new" : "true", @@ -104,6 +105,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_new" : "true", @@ -158,6 +160,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.has_failed_all_retries" : "true", diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-known/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-known/events.ftl index 854ab9d281e..a57be42845f 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-known/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-known/events.ftl @@ -52,6 +52,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "testng-7", diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-parameterized/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-parameterized/events.ftl index 50b7efe07e7..83522657ca1 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-parameterized/events.ftl @@ -100,6 +100,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "testng-7", diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed/events.ftl index 3d8fc3bdf1b..f0f1853fdb4 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed/events.ftl @@ -52,6 +52,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "testng-7", diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-retry-error/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-retry-error/events.ftl index cf2a932da20..f9d716f9b9d 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-retry-error/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-retry-error/events.ftl @@ -52,6 +52,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "testng-7", @@ -102,6 +103,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -154,6 +156,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -206,6 +209,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-retry-failed/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-retry-failed/events.ftl index 491a415d7fa..bbf6423af09 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-retry-failed/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-retry-failed/events.ftl @@ -52,6 +52,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "testng-7", @@ -102,6 +103,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -154,6 +156,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -206,6 +209,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-retry-parameterized/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-retry-parameterized/events.ftl index e4bf58e1a47..8092257056a 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-retry-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-retry-parameterized/events.ftl @@ -99,6 +99,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "testng-7", @@ -149,6 +150,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -201,6 +203,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", @@ -253,6 +256,7 @@ "runtime-id" : ${content_meta_runtime_id}, "span.kind" : "test", "test.codeowners" : "[\"owner1\",\"owner2\"]", + "test.failure_suppressed" : "true", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.is_retry" : "true", 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 ea5291c29a2..350f738c82b 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 @@ -265,6 +265,7 @@ "runtime.vendor" : ${content_meta_runtime_vendor}, "runtime.version" : ${content_meta_runtime_version}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : "4.10", "test.module" : ":test", @@ -328,6 +329,7 @@ "runtime.vendor" : ${content_meta_runtime_vendor}, "runtime.version" : ${content_meta_runtime_version}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : "4.10", "test.is_retry" : "true", @@ -393,6 +395,7 @@ "runtime.vendor" : ${content_meta_runtime_vendor}, "runtime.version" : ${content_meta_runtime_version}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : "4.10", "test.is_retry" : "true", @@ -458,6 +461,7 @@ "runtime.vendor" : ${content_meta_runtime_vendor}, "runtime.version" : ${content_meta_runtime_version}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : "4.10", "test.is_retry" : "true", @@ -645,4 +649,4 @@ }, "type" : "span", "version" : 1 -} ] +} ] \ No newline at end of file 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 1c032d9aecf..c1953a9b886 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 @@ -332,6 +332,7 @@ "runtime.vendor" : ${content_meta_runtime_vendor}, "runtime.version" : ${content_meta_runtime_version}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : "4.13.2", "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", @@ -396,6 +397,7 @@ "runtime.vendor" : ${content_meta_runtime_vendor}, "runtime.version" : ${content_meta_runtime_version}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : "4.13.2", "test.is_retry" : "true", @@ -462,6 +464,7 @@ "runtime.vendor" : ${content_meta_runtime_vendor}, "runtime.version" : ${content_meta_runtime_version}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : "4.13.2", "test.is_retry" : "true", @@ -528,6 +531,7 @@ "runtime.vendor" : ${content_meta_runtime_vendor}, "runtime.version" : ${content_meta_runtime_version}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : "4.13.2", "test.is_retry" : "true", @@ -629,4 +633,4 @@ }, "type" : "test", "version" : 2 -} ] +} ] \ No newline at end of file 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 37f7b0b121b..993aa8d3765 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 @@ -300,6 +300,7 @@ "runtime.vendor" : ${content_meta_runtime_vendor}, "runtime.version" : ${content_meta_runtime_version}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : "4.13.2", "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", @@ -366,6 +367,7 @@ "runtime.vendor" : ${content_meta_runtime_vendor}, "runtime.version" : ${content_meta_runtime_version}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : "4.13.2", "test.is_retry" : "true", @@ -434,6 +436,7 @@ "runtime.vendor" : ${content_meta_runtime_vendor}, "runtime.version" : ${content_meta_runtime_version}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : "4.13.2", "test.is_retry" : "true", @@ -502,6 +505,7 @@ "runtime.vendor" : ${content_meta_runtime_vendor}, "runtime.version" : ${content_meta_runtime_version}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : "4.13.2", "test.is_retry" : "true", @@ -570,6 +574,7 @@ "runtime.vendor" : ${content_meta_runtime_vendor}, "runtime.version" : ${content_meta_runtime_version}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : "4.13.2", "test.has_failed_all_retries" : "true", @@ -640,6 +645,7 @@ "runtime.vendor" : ${content_meta_runtime_vendor}, "runtime.version" : ${content_meta_runtime_version}, "span.kind" : "test", + "test.failure_suppressed" : "true", "test.framework" : "junit4", "test.framework_version" : "4.13.2", "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", From ae0456a231e2a005bb8cc0ba04dba6805adeb5e0 Mon Sep 17 00:00:00 2001 From: Nikita Tkachenko Date: Fri, 5 Sep 2025 18:15:42 +0200 Subject: [PATCH 3/3] Do not propagate suppressed test failures to parent spans --- .../domain/SpanTagsPropagator.java | 28 ++++++++----------- .../events.ftl | 6 ++-- .../events.ftl | 6 ++-- .../test-quarantined-failed-atr/events.ftl | 6 ++-- .../test-quarantined-failed-efd/events.ftl | 6 ++-- .../test-quarantined-failed-known/events.ftl | 6 ++-- .../test-quarantined-failed/events.ftl | 6 ++-- .../events.ftl | 6 ++-- .../events.ftl | 6 ++-- .../test-failed-then-succeed/events.ftl | 6 ++-- .../test-quarantined-failed-atr/events.ftl | 6 ++-- .../test-quarantined-failed-efd/events.ftl | 6 ++-- .../test-quarantined-failed-known/events.ftl | 6 ++-- .../test-quarantined-failed/events.ftl | 6 ++-- .../events.ftl | 6 ++-- .../events.ftl | 6 ++-- .../test-quarantined-failed-atr/events.ftl | 6 ++-- .../test-quarantined-failed-efd/events.ftl | 6 ++-- .../test-quarantined-failed-known/events.ftl | 6 ++-- .../events.ftl | 6 ++-- .../test-quarantined-failed/events.ftl | 6 ++-- .../events.ftl | 6 ++-- .../events.ftl | 6 ++-- .../test-failed-then-succeed/events.ftl | 6 ++-- .../test-quarantined-failed-atr/events.ftl | 6 ++-- .../test-quarantined-failed-efd/events.ftl | 6 ++-- .../test-quarantined-failed-known/events.ftl | 6 ++-- .../test-quarantined-failed/events.ftl | 6 ++-- .../events.ftl | 6 ++-- .../events.ftl | 6 ++-- .../test-failed-then-succeed/events.ftl | 6 ++-- .../events.ftl | 6 ++-- .../test-quarantined-failed-atr/events.ftl | 6 ++-- .../test-quarantined-failed-efd/events.ftl | 6 ++-- .../test-quarantined-failed-known/events.ftl | 6 ++-- .../events.ftl | 6 ++-- .../test-quarantined-failed/events.ftl | 6 ++-- .../events.ftl | 6 ++-- .../events.ftl | 6 ++-- .../test-failed-then-succeed/events.ftl | 6 ++-- .../test-quarantined-failed-atr/events.ftl | 6 ++-- .../test-quarantined-failed-efd/events.ftl | 6 ++-- .../test-quarantined-failed-known/events.ftl | 6 ++-- .../events.ftl | 6 ++-- .../test-quarantined-failed/events.ftl | 6 ++-- .../events.ftl | 6 ++-- .../events.ftl | 6 ++-- .../test-failed-then-succeed/events.ftl | 6 ++-- .../test-quarantined-failed-atr/events.ftl | 6 ++-- .../test-quarantined-failed-efd/events.ftl | 6 ++-- .../test-quarantined-failed-known/events.ftl | 6 ++-- .../test-quarantined-failed/events.ftl | 6 ++-- .../events.ftl | 6 ++-- .../events.ftl | 6 ++-- .../test-failed-then-succeed/events.ftl | 6 ++-- .../test-quarantined-failed-atr/events.ftl | 6 ++-- .../test-quarantined-failed-efd/events.ftl | 6 ++-- .../test-quarantined-failed-known/events.ftl | 6 ++-- .../test-quarantined-failed/events.ftl | 6 ++-- .../events.ftl | 6 ++-- .../events.ftl | 6 ++-- .../test-failed-then-succeed/events.ftl | 6 ++-- .../test-quarantined-failed-atr/events.ftl | 6 ++-- .../test-quarantined-failed-efd/events.ftl | 6 ++-- .../test-quarantined-failed-known/events.ftl | 6 ++-- .../events.ftl | 6 ++-- .../test-quarantined-failed/events.ftl | 6 ++-- .../events.ftl | 2 +- 68 files changed, 211 insertions(+), 215 deletions(-) diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/SpanTagsPropagator.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/SpanTagsPropagator.java index d5c4c002aed..8002b235356 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/SpanTagsPropagator.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/SpanTagsPropagator.java @@ -136,23 +136,19 @@ private void unsafePropagateStatus(AgentSpan childSpan) { return; } + Boolean childFailureSuppressed = (Boolean) childSpan.getTag(Tags.TEST_FAILURE_SUPPRESSED); TestStatus parentStatus = (TestStatus) parentSpan.getTag(Tags.TEST_STATUS); - switch (childStatus) { - case pass: - if (parentStatus == null || TestStatus.skip.equals(parentStatus)) { - parentSpan.setTag(Tags.TEST_STATUS, TestStatus.pass); - } - break; - case fail: - parentSpan.setTag(Tags.TEST_STATUS, TestStatus.fail); - break; - case skip: - if (parentStatus == null) { - parentSpan.setTag(Tags.TEST_STATUS, TestStatus.skip); - } - break; - default: - break; + if (childStatus == TestStatus.pass + || (childFailureSuppressed != null && childFailureSuppressed)) { + if (parentStatus == null || TestStatus.skip.equals(parentStatus)) { + parentSpan.setTag(Tags.TEST_STATUS, TestStatus.pass); + } + } else if (childStatus == TestStatus.fail) { + parentSpan.setTag(Tags.TEST_STATUS, TestStatus.fail); + } else if (childStatus == TestStatus.skip) { + if (parentStatus == null) { + parentSpan.setTag(Tags.TEST_STATUS, TestStatus.skip); + } } } 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 df3808256c7..d12603562df 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 @@ -12,7 +12,7 @@ "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-4", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "test.type" : "test", "test_session.name" : "session-name" @@ -303,7 +303,7 @@ "test.command" : "cucumber-junit-4", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -336,7 +336,7 @@ "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-4", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" 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 1552e19c058..843c6190b66 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 @@ -12,7 +12,7 @@ "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-4", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "test.type" : "test", "test_session.name" : "session-name" @@ -303,7 +303,7 @@ "test.command" : "cucumber-junit-4", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -336,7 +336,7 @@ "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-4", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" 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 c4d2d186cc3..068864724a1 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 @@ -12,7 +12,7 @@ "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-4", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "test.type" : "test", "test_session.name" : "session-name" @@ -297,7 +297,7 @@ "test.command" : "cucumber-junit-4", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -330,7 +330,7 @@ "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-4", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" 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 69a1aee8c28..995d5993ae1 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 @@ -12,7 +12,7 @@ "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-4", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "test.type" : "test", "test_session.name" : "session-name" @@ -201,7 +201,7 @@ "test.early_flake.enabled" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -235,7 +235,7 @@ "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-4", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" 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 e9ffd0f95b0..eb6fecbdd4f 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 @@ -12,7 +12,7 @@ "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-4", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "test.type" : "test", "test_session.name" : "session-name" @@ -97,7 +97,7 @@ "test.early_flake.enabled" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -131,7 +131,7 @@ "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-4", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" 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 6bf52d090de..54380c22247 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 @@ -12,7 +12,7 @@ "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-4", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "test.type" : "test", "test_session.name" : "session-name" @@ -96,7 +96,7 @@ "test.command" : "cucumber-junit-4", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -129,7 +129,7 @@ "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-4", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" 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 18b640078eb..953381ce02e 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 @@ -16,7 +16,7 @@ "test.command" : "munit-junit-4", "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -49,7 +49,7 @@ "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "munit-junit-4", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -82,7 +82,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "munit-junit-4", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailedMUnit", "test.type" : "test", "test_session.name" : "session-name" 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 d662a0a204d..9d73bec4400 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 @@ -16,7 +16,7 @@ "test.command" : "munit-junit-4", "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -49,7 +49,7 @@ "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "munit-junit-4", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -82,7 +82,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "munit-junit-4", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailedMUnit", "test.type" : "test", "test_session.name" : "session-name" 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 23256fae70a..1eccca32ee4 100644 --- a/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-then-succeed/events.ftl +++ b/dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-failed-then-succeed/events.ftl @@ -16,7 +16,7 @@ "test.command" : "munit-junit-4", "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.type" : "test", "test_session.name" : "session-name" }, @@ -48,7 +48,7 @@ "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "munit-junit-4", - "test.status" : "fail", + "test.status" : "pass", "test.type" : "test", "test_session.name" : "session-name" }, @@ -80,7 +80,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "munit-junit-4", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailedThenSucceedMUnit", "test.type" : "test", "test_session.name" : "session-name" 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 8b9d466adad..952286d1d95 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 @@ -16,7 +16,7 @@ "test.command" : "munit-junit-4", "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -49,7 +49,7 @@ "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "munit-junit-4", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -82,7 +82,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "munit-junit-4", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailedMUnit", "test.type" : "test", "test_session.name" : "session-name" 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 6c7a2782dd6..fcef49995d8 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 @@ -17,7 +17,7 @@ "test.early_flake.enabled" : "true", "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -51,7 +51,7 @@ "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "munit-junit-4", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -84,7 +84,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "munit-junit-4", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailedMUnit", "test.type" : "test", "test_session.name" : "session-name" 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 4469e347e72..e0f6a1ca294 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 @@ -17,7 +17,7 @@ "test.early_flake.enabled" : "true", "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -51,7 +51,7 @@ "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "munit-junit-4", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -84,7 +84,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "munit-junit-4", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailedMUnit", "test.type" : "test", "test_session.name" : "session-name" 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 12ef39d8a90..92828e49103 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 @@ -16,7 +16,7 @@ "test.command" : "munit-junit-4", "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -49,7 +49,7 @@ "test.framework" : "munit", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "munit-junit-4", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -82,7 +82,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "munit-junit-4", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailedMUnit", "test.type" : "test", "test_session.name" : "session-name" 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 088bb62c864..8721c159cc6 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 @@ -16,7 +16,7 @@ "test.command" : "junit-4.10", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -49,7 +49,7 @@ "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-4.10", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -82,7 +82,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-4.10", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailed", "test.type" : "test", "test_session.name" : "session-name" 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 74bbe5d31b2..b4f1f90922a 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 @@ -16,7 +16,7 @@ "test.command" : "junit-4.10", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -49,7 +49,7 @@ "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-4.10", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -82,7 +82,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-4.10", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailed", "test.type" : "test", "test_session.name" : "session-name" 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 7ab7ce11e1e..3cfa8d62d88 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 @@ -16,7 +16,7 @@ "test.command" : "junit-4.10", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -49,7 +49,7 @@ "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-4.10", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -82,7 +82,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-4.10", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailed", "test.type" : "test", "test_session.name" : "session-name" 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 e3d7e4108ce..c2f029f53c0 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 @@ -17,7 +17,7 @@ "test.early_flake.enabled" : "true", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -51,7 +51,7 @@ "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-4.10", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -84,7 +84,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-4.10", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailed", "test.type" : "test", "test_session.name" : "session-name" 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 5c17cffa2ba..84951dcfb72 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 @@ -17,7 +17,7 @@ "test.early_flake.enabled" : "true", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -51,7 +51,7 @@ "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-4.10", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -84,7 +84,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-4.10", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailed", "test.type" : "test", "test_session.name" : "session-name" 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 b42aa06d939..9c5b4d9bfcf 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 @@ -16,7 +16,7 @@ "test.command" : "junit-4.10", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -49,7 +49,7 @@ "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-4.10", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -82,7 +82,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-4.10", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailedParameterized", "test.type" : "test", "test_session.name" : "session-name" 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 c5943e7d5c2..e6dc0c1eb21 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 @@ -16,7 +16,7 @@ "test.command" : "junit-4.10", "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -49,7 +49,7 @@ "test.framework" : "junit4", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-4.10", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -82,7 +82,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-4.10", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailed", "test.type" : "test", "test_session.name" : "session-name" 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 99a42742d3f..06a2a7b30a9 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 @@ -12,7 +12,7 @@ "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-5", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "test.type" : "test", "test_session.name" : "session-name" @@ -303,7 +303,7 @@ "test.command" : "cucumber-junit-5", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -336,7 +336,7 @@ "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-5", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" 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 1d8611c28e9..52a582f49a5 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 @@ -12,7 +12,7 @@ "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-5", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "test.type" : "test", "test_session.name" : "session-name" @@ -303,7 +303,7 @@ "test.command" : "cucumber-junit-5", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -336,7 +336,7 @@ "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-5", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" 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 63f96216a34..dd5a5721ea5 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 @@ -12,7 +12,7 @@ "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-5", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed_then_succeed.feature:Basic Arithmetic", "test.type" : "test", "test_session.name" : "session-name" @@ -189,7 +189,7 @@ "test.command" : "cucumber-junit-5", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.type" : "test", "test_session.name" : "session-name" }, @@ -221,7 +221,7 @@ "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-5", - "test.status" : "fail", + "test.status" : "pass", "test.type" : "test", "test_session.name" : "session-name" }, 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 475eea18531..a1840afbf79 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 @@ -12,7 +12,7 @@ "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-5", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "test.type" : "test", "test_session.name" : "session-name" @@ -297,7 +297,7 @@ "test.command" : "cucumber-junit-5", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -330,7 +330,7 @@ "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-5", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" 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 3be488d87b3..26019119939 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 @@ -12,7 +12,7 @@ "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-5", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "test.type" : "test", "test_session.name" : "session-name" @@ -201,7 +201,7 @@ "test.early_flake.enabled" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -235,7 +235,7 @@ "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-5", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" 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 9769a2e53a2..4c13812a695 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 @@ -12,7 +12,7 @@ "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-5", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "test.type" : "test", "test_session.name" : "session-name" @@ -97,7 +97,7 @@ "test.early_flake.enabled" : "true", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -131,7 +131,7 @@ "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-5", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" 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 41716dc364d..57a1a2b1f8d 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 @@ -12,7 +12,7 @@ "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-5", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "test.type" : "test", "test_session.name" : "session-name" @@ -96,7 +96,7 @@ "test.command" : "cucumber-junit-5", "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -129,7 +129,7 @@ "test.framework" : "cucumber", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "cucumber-junit-5", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" 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 08369c35320..9b5c4b9d11a 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 @@ -14,7 +14,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "spock-junit-5", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailedSpock", "test.type" : "test", "test_session.name" : "session-name" @@ -327,7 +327,7 @@ "test.command" : "spock-junit-5", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -360,7 +360,7 @@ "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "spock-junit-5", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" 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 64cb72fddd4..c648d966781 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 @@ -14,7 +14,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "spock-junit-5", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailedSpock", "test.type" : "test", "test_session.name" : "session-name" @@ -327,7 +327,7 @@ "test.command" : "spock-junit-5", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -360,7 +360,7 @@ "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "spock-junit-5", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" 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 876990e534a..f1c1c2ba690 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-failed-then-succeed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-failed-then-succeed/events.ftl @@ -14,7 +14,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "spock-junit-5", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailedThenSucceedSpock", "test.type" : "test", "test_session.name" : "session-name" @@ -258,7 +258,7 @@ "test.command" : "spock-junit-5", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.type" : "test", "test_session.name" : "session-name" }, @@ -290,7 +290,7 @@ "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "spock-junit-5", - "test.status" : "fail", + "test.status" : "pass", "test.type" : "test", "test_session.name" : "session-name" }, 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 def72743359..49424ff2c49 100644 --- a/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-parameterized-failed-then-succeed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/spock-junit-5/src/test/resources/test-parameterized-failed-then-succeed/events.ftl @@ -14,7 +14,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "spock-junit-5", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailedThenSucceedParameterizedSpock", "test.type" : "test", "test_session.name" : "session-name" @@ -256,7 +256,7 @@ "test.command" : "spock-junit-5", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.type" : "test", "test_session.name" : "session-name" }, @@ -288,7 +288,7 @@ "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "spock-junit-5", - "test.status" : "fail", + "test.status" : "pass", "test.type" : "test", "test_session.name" : "session-name" }, 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 6fe993c9748..46d3c23c7f7 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 @@ -14,7 +14,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "spock-junit-5", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailedSpock", "test.type" : "test", "test_session.name" : "session-name" @@ -321,7 +321,7 @@ "test.command" : "spock-junit-5", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -354,7 +354,7 @@ "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "spock-junit-5", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" 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 41bed5164f3..d87ac05d9bf 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 @@ -14,7 +14,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "spock-junit-5", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailedSpock", "test.type" : "test", "test_session.name" : "session-name" @@ -217,7 +217,7 @@ "test.early_flake.enabled" : "true", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -251,7 +251,7 @@ "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "spock-junit-5", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" 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 1c445c72f97..ff83f33acc3 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 @@ -14,7 +14,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "spock-junit-5", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailedSpock", "test.type" : "test", "test_session.name" : "session-name" @@ -105,7 +105,7 @@ "test.early_flake.enabled" : "true", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -139,7 +139,7 @@ "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "spock-junit-5", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" 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 06c062d0780..af736fc1615 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 @@ -14,7 +14,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "spock-junit-5", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailedParameterizedSpock", "test.type" : "test", "test_session.name" : "session-name" @@ -153,7 +153,7 @@ "test.command" : "spock-junit-5", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -186,7 +186,7 @@ "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "spock-junit-5", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" 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 d42a4a88ffb..170c7fb3565 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 @@ -14,7 +14,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "spock-junit-5", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailedSpock", "test.type" : "test", "test_session.name" : "session-name" @@ -104,7 +104,7 @@ "test.command" : "spock-junit-5", "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -137,7 +137,7 @@ "test.framework" : "spock", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "spock-junit-5", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" 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 358a066270f..54fb4e2e798 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 @@ -16,7 +16,7 @@ "test.command" : "junit-5.3", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -49,7 +49,7 @@ "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-5.3", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -82,7 +82,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-5.3", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailed", "test.type" : "test", "test_session.name" : "session-name" 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 810fcc3d2ae..9023d5de11a 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 @@ -16,7 +16,7 @@ "test.command" : "junit-5.3", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -49,7 +49,7 @@ "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-5.3", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -82,7 +82,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-5.3", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailed", "test.type" : "test", "test_session.name" : "session-name" 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 febe49f17d0..f2345acfaee 100644 --- a/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-failed-then-succeed/events.ftl +++ b/dd-java-agent/instrumentation/junit-5.3/src/test/resources/test-failed-then-succeed/events.ftl @@ -16,7 +16,7 @@ "test.command" : "junit-5.3", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.type" : "test", "test_session.name" : "session-name" }, @@ -48,7 +48,7 @@ "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-5.3", - "test.status" : "fail", + "test.status" : "pass", "test.type" : "test", "test_session.name" : "session-name" }, @@ -80,7 +80,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-5.3", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailedThenSucceed", "test.type" : "test", "test_session.name" : "session-name" 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 9d2c608a418..6677c9986aa 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 @@ -16,7 +16,7 @@ "test.command" : "junit-5.3", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -49,7 +49,7 @@ "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-5.3", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -82,7 +82,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-5.3", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailed", "test.type" : "test", "test_session.name" : "session-name" 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 41b1dfc868f..d30c4507c98 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 @@ -17,7 +17,7 @@ "test.early_flake.enabled" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -51,7 +51,7 @@ "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-5.3", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -84,7 +84,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-5.3", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailed", "test.type" : "test", "test_session.name" : "session-name" 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 571898d8e2f..bb28ed09232 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 @@ -17,7 +17,7 @@ "test.early_flake.enabled" : "true", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -51,7 +51,7 @@ "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-5.3", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -84,7 +84,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-5.3", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailed", "test.type" : "test", "test_session.name" : "session-name" 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 2b1ae540591..dab5cc36583 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 @@ -16,7 +16,7 @@ "test.command" : "junit-5.3", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -49,7 +49,7 @@ "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-5.3", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -82,7 +82,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-5.3", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailedParameterized", "test.type" : "test", "test_session.name" : "session-name" 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 7ab3ed1fd74..1fbf6de0bad 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 @@ -16,7 +16,7 @@ "test.command" : "junit-5.3", "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -49,7 +49,7 @@ "test.framework" : "junit5", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-5.3", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -82,7 +82,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "junit-5.3", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailed", "test.type" : "test", "test_session.name" : "session-name" diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl index 7df8e557e84..89303af5abd 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl @@ -156,7 +156,7 @@ "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "karate", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "[org/example/test_failed] test failed", "test.type" : "test", "test_session.name" : "session-name" @@ -484,7 +484,7 @@ "test.command" : "karate", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -517,7 +517,7 @@ "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "karate", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl index 592fc25cf2d..1fca5f44d6b 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl @@ -156,7 +156,7 @@ "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "karate", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "[org/example/test_failed] test failed", "test.type" : "test", "test_session.name" : "session-name" @@ -484,7 +484,7 @@ "test.command" : "karate", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -517,7 +517,7 @@ "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "karate", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-failed-then-succeed/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-failed-then-succeed/events.ftl index fc83695d13c..11a32c7ad64 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-failed-then-succeed/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-failed-then-succeed/events.ftl @@ -84,7 +84,7 @@ "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "karate", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "[org/example/test_failed_then_succeed] test failed", "test.type" : "test", "test_session.name" : "session-name" @@ -258,7 +258,7 @@ "test.command" : "karate", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.type" : "test", "test_session.name" : "session-name" }, @@ -290,7 +290,7 @@ "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "karate", - "test.status" : "fail", + "test.status" : "pass", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-quarantined-failed-atr/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-quarantined-failed-atr/events.ftl index 35779b8dcee..3a5245f2640 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-quarantined-failed-atr/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-quarantined-failed-atr/events.ftl @@ -156,7 +156,7 @@ "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "karate", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "[org/example/test_failed] test failed", "test.type" : "test", "test_session.name" : "session-name" @@ -478,7 +478,7 @@ "test.command" : "karate", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -511,7 +511,7 @@ "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "karate", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-quarantined-failed-efd/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-quarantined-failed-efd/events.ftl index b1a4a446421..a8b563b5d7b 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-quarantined-failed-efd/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-quarantined-failed-efd/events.ftl @@ -156,7 +156,7 @@ "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "karate", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "[org/example/test_failed] test failed", "test.type" : "test", "test_session.name" : "session-name" @@ -476,7 +476,7 @@ "test.early_flake.enabled" : "true", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -511,7 +511,7 @@ "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "karate", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-quarantined-failed-known/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-quarantined-failed-known/events.ftl index 2976254d80b..32ea514cf0a 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-quarantined-failed-known/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-quarantined-failed-known/events.ftl @@ -108,7 +108,7 @@ "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "karate", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "[org/example/test_failed] test failed", "test.type" : "test", "test_session.name" : "session-name" @@ -325,7 +325,7 @@ "test.early_flake.enabled" : "true", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -359,7 +359,7 @@ "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "karate", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" diff --git a/dd-java-agent/instrumentation/karate/src/test/resources/test-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/karate/src/test/resources/test-quarantined-failed/events.ftl index 123f6b283e3..9135b5cebca 100644 --- a/dd-java-agent/instrumentation/karate/src/test/resources/test-quarantined-failed/events.ftl +++ b/dd-java-agent/instrumentation/karate/src/test/resources/test-quarantined-failed/events.ftl @@ -60,7 +60,7 @@ "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "karate", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "[org/example/test_failed] test failed", "test.type" : "test", "test_session.name" : "session-name" @@ -185,7 +185,7 @@ "test.command" : "karate", "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -218,7 +218,7 @@ "test.framework" : "karate", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "karate", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl index 7a284fd6f9d..529548a66c2 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl +++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl @@ -14,7 +14,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "scalatest", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailed", "test.type" : "test", "test_session.name" : "session-name" @@ -312,7 +312,7 @@ "test.command" : "scalatest", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -345,7 +345,7 @@ "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "scalatest", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl index 90ad1610e47..178585be3b6 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl +++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl @@ -14,7 +14,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "scalatest", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailed", "test.type" : "test", "test_session.name" : "session-name" @@ -312,7 +312,7 @@ "test.command" : "scalatest", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -345,7 +345,7 @@ "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "scalatest", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-failed-then-succeed/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-failed-then-succeed/events.ftl index 72a1be1d3bc..b213769d942 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-failed-then-succeed/events.ftl +++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-failed-then-succeed/events.ftl @@ -14,7 +14,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "scalatest", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailedThenSucceed", "test.type" : "test", "test_session.name" : "session-name" @@ -196,7 +196,7 @@ "test.command" : "scalatest", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.type" : "test", "test_session.name" : "session-name" }, @@ -228,7 +228,7 @@ "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "scalatest", - "test.status" : "fail", + "test.status" : "pass", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed-atr/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed-atr/events.ftl index 2d9fcacb2d0..4805942e008 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed-atr/events.ftl +++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed-atr/events.ftl @@ -14,7 +14,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "scalatest", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailed", "test.type" : "test", "test_session.name" : "session-name" @@ -306,7 +306,7 @@ "test.command" : "scalatest", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -339,7 +339,7 @@ "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "scalatest", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed-efd/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed-efd/events.ftl index d6fa969fc85..cb5cc969de1 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed-efd/events.ftl +++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed-efd/events.ftl @@ -14,7 +14,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "scalatest", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailed", "test.type" : "test", "test_session.name" : "session-name" @@ -208,7 +208,7 @@ "test.early_flake.enabled" : "true", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -242,7 +242,7 @@ "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "scalatest", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed-known/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed-known/events.ftl index 25c73ba1567..7d061761897 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed-known/events.ftl +++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed-known/events.ftl @@ -14,7 +14,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "scalatest", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailed", "test.type" : "test", "test_session.name" : "session-name" @@ -102,7 +102,7 @@ "test.early_flake.enabled" : "true", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -136,7 +136,7 @@ "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "scalatest", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" diff --git a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed/events.ftl index cd3e6d382e2..2d1b1544657 100644 --- a/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed/events.ftl +++ b/dd-java-agent/instrumentation/scalatest/src/test/resources/test-quarantined-failed/events.ftl @@ -14,7 +14,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "scalatest", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailed", "test.type" : "test", "test_session.name" : "session-name" @@ -101,7 +101,7 @@ "test.command" : "scalatest", "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -134,7 +134,7 @@ "test.framework" : "scalatest", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "scalatest", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl index 06335ed589f..7d48ff28647 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl @@ -14,7 +14,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "testng-7", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailed", "test.type" : "test", "test_session.name" : "session-name" @@ -327,7 +327,7 @@ "test.command" : "testng-7", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -360,7 +360,7 @@ "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "testng-7", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl index a21ea4d7431..3faae5368fb 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl @@ -14,7 +14,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "testng-7", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailed", "test.type" : "test", "test_session.name" : "session-name" @@ -327,7 +327,7 @@ "test.command" : "testng-7", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -360,7 +360,7 @@ "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "testng-7", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-then-succeed/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-then-succeed/events.ftl index dc84ac43595..75de7210789 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-then-succeed/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-failed-then-succeed/events.ftl @@ -14,7 +14,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "testng-7", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailedThenSucceed", "test.type" : "test", "test_session.name" : "session-name" @@ -205,7 +205,7 @@ "test.command" : "testng-7", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.type" : "test", "test_session.name" : "session-name" }, @@ -237,7 +237,7 @@ "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "testng-7", - "test.status" : "fail", + "test.status" : "pass", "test.type" : "test", "test_session.name" : "session-name" }, diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-atr/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-atr/events.ftl index bbf41dc65cd..eac6f235412 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-atr/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-atr/events.ftl @@ -14,7 +14,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "testng-7", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailed", "test.type" : "test", "test_session.name" : "session-name" @@ -321,7 +321,7 @@ "test.command" : "testng-7", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -354,7 +354,7 @@ "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "testng-7", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-efd/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-efd/events.ftl index b3cd46f6d14..bdba4be7d2a 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-efd/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-efd/events.ftl @@ -14,7 +14,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "testng-7", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailed", "test.type" : "test", "test_session.name" : "session-name" @@ -217,7 +217,7 @@ "test.early_flake.enabled" : "true", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -251,7 +251,7 @@ "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "testng-7", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-known/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-known/events.ftl index a57be42845f..5cb01481320 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-known/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-known/events.ftl @@ -14,7 +14,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "testng-7", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailed", "test.type" : "test", "test_session.name" : "session-name" @@ -105,7 +105,7 @@ "test.early_flake.enabled" : "true", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -139,7 +139,7 @@ "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "testng-7", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-parameterized/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-parameterized/events.ftl index 83522657ca1..bc11c491fe9 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-parameterized/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed-parameterized/events.ftl @@ -14,7 +14,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "testng-7", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailedParameterized", "test.type" : "test", "test_session.name" : "session-name" @@ -153,7 +153,7 @@ "test.command" : "testng-7", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -186,7 +186,7 @@ "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "testng-7", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" diff --git a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed/events.ftl index f0f1853fdb4..8498c05e7d4 100644 --- a/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed/events.ftl +++ b/dd-java-agent/instrumentation/testng/testng-7/src/test/resources/test-quarantined-failed/events.ftl @@ -14,7 +14,7 @@ "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "testng-7", "test.source.file" : "dummy_source_path", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "org.example.TestFailed", "test.type" : "test", "test_session.name" : "session-name" @@ -104,7 +104,7 @@ "test.command" : "testng-7", "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" @@ -137,7 +137,7 @@ "test.framework" : "testng", "test.framework_version" : ${content_meta_test_framework_version}, "test.module" : "testng-7", - "test.status" : "fail", + "test.status" : "pass", "test.test_management.enabled" : "true", "test.type" : "test", "test_session.name" : "session-name" 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 993aa8d3765..8d7b4426a7f 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 @@ -245,7 +245,7 @@ "test.framework_version" : "4.13.2", "test.module" : "Maven Smoke Tests Project maven-surefire-plugin default-test", "test.source.file" : "src/test/java/datadog/smoke/TestFailed.java", - "test.status" : "fail", + "test.status" : "pass", "test.suite" : "datadog.smoke.TestFailed", "test.type" : "test", "test_session.name" : "mvn -B test"