From eeb79514f69ea88762a9df745cbc6b0d77cb058b Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Wed, 12 Mar 2025 11:50:57 +0100 Subject: [PATCH 1/5] capabilities versioning and commit message on test management request --- .../config/ExecutionSettings.java | 38 ------------------- .../config/ExecutionSettingsFactoryImpl.java | 1 + .../config/TracerEnvironment.java | 30 +++++++++++++++ .../trace/civisibility/domain/TestImpl.java | 6 +-- .../civisibility/domain/TestSuiteImpl.java | 8 ++-- .../domain/buildsystem/ProxyTestModule.java | 8 ++-- .../domain/buildsystem/ProxyTestSession.java | 7 ++-- .../domain/headless/HeadlessTestModule.java | 8 ++-- .../domain/headless/HeadlessTestSession.java | 7 ++-- .../domain/manualapi/ManualApiTestModule.java | 2 +- .../config/ConfigurationApiImplTest.groovy | 1 + .../config/ExecutionSettingsTest.groovy | 17 --------- .../civisibility/domain/TestImplTest.groovy | 20 +++++----- .../domain/TestSuiteImplTest.groovy | 2 +- .../config/test-management-tests-request.ftl | 15 ++++---- .../config/LibraryCapability.java | 24 +++++++----- 16 files changed, 88 insertions(+), 106 deletions(-) diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettings.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettings.java index cdca5314c6e..3803bdf53f7 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettings.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettings.java @@ -232,44 +232,6 @@ public Diff getPullRequestDiff() { return pullRequestDiff; } - @Nonnull - public Map getCapabilitiesStatus( - Collection capabilities) { - Map status = new EnumMap<>(LibraryCapability.class); - - for (LibraryCapability c : capabilities) { - switch (c) { - case TIA: - status.put(c, isTestSkippingEnabled()); - break; - case EFD: - EarlyFlakeDetectionSettings efdSettings = getEarlyFlakeDetectionSettings(); - status.put(c, efdSettings.isEnabled()); - break; - case ATR: - status.put(c, isFlakyTestRetriesEnabled()); - break; - case IMPACTED: - status.put(c, isImpactedTestsDetectionEnabled()); - break; - case FAIL_FAST: - String testOrder = Config.get().getCiVisibilityTestOrder(); - status.put(c, CIConstants.FAIL_FAST_TEST_ORDER.equalsIgnoreCase(testOrder)); - break; - case QUARANTINE: - case DISABLED: - case ATTEMPT_TO_FIX: - TestManagementSettings testManagementSettings = getTestManagementSettings(); - status.put(c, testManagementSettings.isEnabled()); - break; - default: - break; - } - } - - return status; - } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettingsFactoryImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettingsFactoryImpl.java index c0beee97019..3e0a62105e5 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettingsFactoryImpl.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettingsFactoryImpl.java @@ -107,6 +107,7 @@ private TracerEnvironment buildTracerEnvironment(JvmInfo jvmInfo, @Nullable Stri .repositoryUrl(gitInfo.getRepositoryURL()) .branch(gitInfo.getBranch()) .sha(gitInfo.getCommit().getSha()) + .commitMessage(gitInfo.getCommit().getFullMessage()) .osPlatform(wellKnownTags.getOsPlatform().toString()) .osArchitecture(wellKnownTags.getOsArch().toString()) .osVersion(wellKnownTags.getOsVersion().toString()) diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TracerEnvironment.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TracerEnvironment.java index e622bb14021..169ce6147ca 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TracerEnvironment.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TracerEnvironment.java @@ -16,9 +16,13 @@ public class TracerEnvironment { private final String branch; private final String sha; + @Json(name = "commit_message") + private final String commitMessage; + @Json(name = "test_level") private final String testLevel = "test"; + private final String module; private final Configurations configurations; private TracerEnvironment( @@ -27,12 +31,16 @@ private TracerEnvironment( String repositoryUrl, String branch, String sha, + String commitMessage, + String module, Configurations configurations) { this.service = service; this.env = env; this.repositoryUrl = repositoryUrl; this.branch = branch; this.sha = sha; + this.commitMessage = commitMessage; + this.module = module; this.configurations = configurations; } @@ -40,6 +48,10 @@ public String getSha() { return sha; } + public String getCommitMessage() { + return commitMessage; + } + public String getService() { return service; } @@ -60,6 +72,10 @@ public String getTestLevel() { return testLevel; } + public String getModule() { + return module; + } + public Configurations getConfigurations() { return configurations; } @@ -82,9 +98,15 @@ public String toString() { + ", sha='" + sha + '\'' + + ", commitMessage='" + + commitMessage + + '\'' + ", testLevel='" + testLevel + '\'' + + ", module='" + + module + + '\'' + ", configurations=" + configurations + '}'; @@ -100,6 +122,7 @@ public static final class Builder { private String repositoryUrl; private String branch; private String sha; + private String commitMessage; private String osPlatform; private String osArchitecture; private String osVersion; @@ -135,6 +158,11 @@ public Builder sha(String sha) { return this; } + public Builder commitMessage(String commitMessage) { + this.commitMessage = commitMessage; + return this; + } + public Builder osPlatform(String osPlatform) { this.osPlatform = osPlatform; return this; @@ -187,6 +215,8 @@ public TracerEnvironment build() { repositoryUrl, branch, sha, + commitMessage, + testBundle, new Configurations( osPlatform, osArchitecture, diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java index df7a3eaef67..22d6b98a294 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java @@ -87,7 +87,7 @@ public TestImpl( Codeowners codeowners, CoverageStore.Factory coverageStoreFactory, ExecutionResults executionResults, - @Nonnull Map libraryCapabilities, + @Nonnull Collection capabilities, Consumer onSpanFinish) { this.instrumentation = instrumentation; this.metricCollector = metricCollector; @@ -146,8 +146,8 @@ public TestImpl( span.setTag(Tags.ITR_CORRELATION_ID, itrCorrelationId); } - for (Map.Entry entry : libraryCapabilities.entrySet()) { - span.setTag(entry.getKey().asTag(), entry.getValue()); + for (LibraryCapability capability : capabilities) { + span.setTag(capability.asTag(), capability.getVersion()); } testDecorator.afterStart(span); diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java index db00a8dfba7..26614293932 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java @@ -54,7 +54,7 @@ public class TestSuiteImpl implements DDTestSuite { private final CoverageStore.Factory coverageStoreFactory; private final ExecutionResults executionResults; private final boolean parallelized; - private final Map libraryCapabilities; + private final Collection capabilities; private final Consumer onSpanFinish; public TestSuiteImpl( @@ -75,7 +75,7 @@ public TestSuiteImpl( LinesResolver linesResolver, CoverageStore.Factory coverageStoreFactory, ExecutionResults executionResults, - @Nonnull Map libraryCapabilities, + @Nonnull Collection capabilities, Consumer onSpanFinish) { this.moduleSpanContext = moduleSpanContext; this.moduleName = moduleName; @@ -92,7 +92,7 @@ public TestSuiteImpl( this.linesResolver = linesResolver; this.coverageStoreFactory = coverageStoreFactory; this.executionResults = executionResults; - this.libraryCapabilities = libraryCapabilities; + this.capabilities = capabilities; this.onSpanFinish = onSpanFinish; AgentTracer.SpanBuilder spanBuilder = @@ -263,7 +263,7 @@ public TestImpl testStart( codeowners, coverageStoreFactory, executionResults, - libraryCapabilities, + capabilities, SpanUtils.propagateCiVisibilityTagsTo(span)); } } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestModule.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestModule.java index 0b77d2b0824..8d3e433650e 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestModule.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestModule.java @@ -62,7 +62,7 @@ public class ProxyTestModule implements TestFrameworkModule { private final LinesResolver linesResolver; private final CoverageStore.Factory coverageStoreFactory; private final Collection testFrameworks = ConcurrentHashMap.newKeySet(); - private final Map libraryCapabilities; + private final Collection capabilities; public ProxyTestModule( AgentSpanContext parentProcessModuleContext, @@ -77,7 +77,7 @@ public ProxyTestModule( CoverageStore.Factory coverageStoreFactory, ChildProcessCoverageReporter childProcessCoverageReporter, SignalClient.Factory signalClientFactory, - Map libraryCapabilities) { + Collection capabilities) { this.parentProcessModuleContext = parentProcessModuleContext; this.moduleName = moduleName; this.executionStrategy = executionStrategy; @@ -91,7 +91,7 @@ public ProxyTestModule( this.codeowners = codeowners; this.linesResolver = linesResolver; this.coverageStoreFactory = coverageStoreFactory; - this.libraryCapabilities = libraryCapabilities; + this.capabilities = capabilities; } @Override @@ -216,7 +216,7 @@ public TestSuiteImpl testSuiteStart( linesResolver, coverageStoreFactory, executionResults, - libraryCapabilities, + capabilities, this::propagateTestFrameworkData); } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestSession.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestSession.java index a44dc030bbf..7a851533d99 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestSession.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestSession.java @@ -38,7 +38,7 @@ public class ProxyTestSession implements TestFrameworkSession { private final ChildProcessCoverageReporter childProcessCoverageReporter; private final SignalClient.Factory signalClientFactory; private final ExecutionStrategy executionStrategy; - private final Map libraryCapabilities; + private final Collection capabilities; public ProxyTestSession( AgentSpanContext parentProcessModuleContext, @@ -64,8 +64,7 @@ public ProxyTestSession( this.childProcessCoverageReporter = childProcessCoverageReporter; this.signalClientFactory = signalClientFactory; this.executionStrategy = executionStrategy; - this.libraryCapabilities = - executionStrategy.getExecutionSettings().getCapabilitiesStatus(capabilities); + this.capabilities = capabilities; } @Override @@ -91,6 +90,6 @@ public TestFrameworkModule testModuleStart(String moduleName, @Nullable Long sta coverageStoreFactory, childProcessCoverageReporter, signalClientFactory, - libraryCapabilities); + capabilities); } } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java index 96c182990fd..fd55662897d 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java @@ -46,7 +46,7 @@ public class HeadlessTestModule extends AbstractTestModule implements TestFramew private final CoverageStore.Factory coverageStoreFactory; private final ExecutionStrategy executionStrategy; private final ExecutionResults executionResults; - private final Map libraryCapabilities; + private final Collection capabilities; public HeadlessTestModule( AgentSpanContext sessionSpanContext, @@ -60,7 +60,7 @@ public HeadlessTestModule( LinesResolver linesResolver, CoverageStore.Factory coverageStoreFactory, ExecutionStrategy executionStrategy, - Map libraryCapabilities, + Collection capabilities, Consumer onSpanFinish) { super( sessionSpanContext, @@ -77,7 +77,7 @@ public HeadlessTestModule( this.coverageStoreFactory = coverageStoreFactory; this.executionStrategy = executionStrategy; this.executionResults = new ExecutionResults(); - this.libraryCapabilities = libraryCapabilities; + this.capabilities = capabilities; } @Override @@ -188,7 +188,7 @@ public TestSuiteImpl testSuiteStart( linesResolver, coverageStoreFactory, executionResults, - libraryCapabilities, + capabilities, SpanUtils.propagateCiVisibilityTagsTo(span)); } } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java index 7d43d8db71c..8319d4829df 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java @@ -37,7 +37,7 @@ public class HeadlessTestSession extends AbstractTestSession implements TestFram private final ExecutionStrategy executionStrategy; private final CoverageStore.Factory coverageStoreFactory; - private final Map libraryCapabilities; + private final Collection capabilities; public HeadlessTestSession( String projectName, @@ -65,8 +65,7 @@ public HeadlessTestSession( linesResolver); this.executionStrategy = executionStrategy; this.coverageStoreFactory = coverageStoreFactory; - this.libraryCapabilities = - executionStrategy.getExecutionSettings().getCapabilitiesStatus(capabilities); + this.capabilities = capabilities; } @Override @@ -83,7 +82,7 @@ public HeadlessTestModule testModuleStart(String moduleName, @Nullable Long star linesResolver, coverageStoreFactory, executionStrategy, - libraryCapabilities, + capabilities, this::propagateModuleTags); } diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java index 627edd654c4..217409521c7 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java @@ -80,7 +80,7 @@ public TestSuiteImpl testSuiteStart( linesResolver, coverageStoreFactory, executionResults, - Collections.emptyMap(), + Collections.emptyList(), SpanUtils.propagateCiVisibilityTagsTo(span)); } } diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/ConfigurationApiImplTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/ConfigurationApiImplTest.groovy index f65c434a9c8..6afd6186b4a 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/ConfigurationApiImplTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/ConfigurationApiImplTest.groovy @@ -320,6 +320,7 @@ class ConfigurationApiImplTest extends Specification { .repositoryUrl("https://github.com/DataDog/foo") .branch("prod") .sha("d64185e45d1722ab3a53c45be47accae") + .commitMessage("full commit message") .osPlatform("linux") .osArchitecture("amd64") .osVersion("bionic") diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/ExecutionSettingsTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/ExecutionSettingsTest.groovy index 495767cf336..cd9a84e3fd8 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/ExecutionSettingsTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/ExecutionSettingsTest.groovy @@ -110,23 +110,6 @@ class ExecutionSettingsTest extends DDSpecification { ] } - def "test capabilities status: #testcaseName"() { - when: - def executionSettings = givenExecutionSettings(settingsEnabled) - - def capabilitiesStatus = executionSettings.getCapabilitiesStatus(capabilities) - def expectedStatus = capabilities.stream().collect(Collectors.toMap(item -> item, item -> settingsEnabled)) - - then: - capabilitiesStatus == expectedStatus - - where: - testcaseName | settingsEnabled | capabilities - "capabilities-disabled" | false | LibraryCapability.values().toList() - "capabilities-enabled" | true | LibraryCapability.values().toList() - "capabilities-filtering" | true | [LibraryCapability.TIA, LibraryCapability.ATR, LibraryCapability.IMPACTED, LibraryCapability.QUARANTINE] - } - private ExecutionSettings givenExecutionSettings(boolean settingsEnabled) { if (settingsEnabled) { injectSysConfig(CiVisibilityConfig.CIVISIBILITY_TEST_ORDER, CIConstants.FAIL_FAST_TEST_ORDER) diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy index e1e659010f9..769cbec3ffb 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy @@ -35,11 +35,11 @@ class TestImplTest extends SpanWriterTest { parent() spanType DDSpanTypes.TEST tags(false) { - "${LibraryCapability.TIA.asTag()}" true - "${LibraryCapability.EFD.asTag()}" false - "${LibraryCapability.QUARANTINE.asTag()}" true - "${LibraryCapability.DISABLED.asTag()}" false - "${LibraryCapability.ATTEMPT_TO_FIX.asTag()}" true + "${LibraryCapability.TIA.asTag()}" "${LibraryCapability.TIA.getVersion()}" + "${LibraryCapability.EFD.asTag()}" "${LibraryCapability.EFD.getVersion()}" + "${LibraryCapability.QUARANTINE.asTag()}" "${LibraryCapability.QUARANTINE.getVersion()}" + "${LibraryCapability.DISABLED.asTag()}" "${LibraryCapability.DISABLED.getVersion()}" + "${LibraryCapability.ATTEMPT_TO_FIX.asTag()}" "${LibraryCapability.ATTEMPT_TO_FIX.getVersion()}" } } } @@ -114,11 +114,11 @@ class TestImplTest extends SpanWriterTest { def codeowners = NoCodeowners.INSTANCE def libraryCapabilities = [ - (LibraryCapability.TIA) : true, - (LibraryCapability.EFD) : false, - (LibraryCapability.QUARANTINE) : true, - (LibraryCapability.DISABLED) : false, - (LibraryCapability.ATTEMPT_TO_FIX): true] + LibraryCapability.TIA, + LibraryCapability.EFD, + LibraryCapability.QUARANTINE, + LibraryCapability.DISABLED, + LibraryCapability.ATTEMPT_TO_FIX] new TestImpl( moduleSpanContext, diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestSuiteImplTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestSuiteImplTest.groovy index f51f8df278f..aed8ffa88db 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestSuiteImplTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestSuiteImplTest.groovy @@ -85,7 +85,7 @@ class TestSuiteImplTest extends SpanWriterTest { linesResolver, coverageStoreFactory, executionResults, - [:], + [], SpanUtils.DO_NOT_PROPAGATE_CI_VISIBILITY_TAGS ) } diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/datadog/trace/civisibility/config/test-management-tests-request.ftl b/dd-java-agent/agent-ci-visibility/src/test/resources/datadog/trace/civisibility/config/test-management-tests-request.ftl index 4b9593e0a43..088905cca4a 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/resources/datadog/trace/civisibility/config/test-management-tests-request.ftl +++ b/dd-java-agent/agent-ci-visibility/src/test/resources/datadog/trace/civisibility/config/test-management-tests-request.ftl @@ -3,13 +3,14 @@ "type" : "ci_app_libraries_tests_request", "id" : "${uid}", "attributes": { - "service" : "${tracerEnvironment.service}", - "env" : "${tracerEnvironment.env}", - "repository_url": "${tracerEnvironment.repositoryUrl}", - "branch" : "${tracerEnvironment.branch}", - "sha" : "${tracerEnvironment.sha}", - "test_level" : "${tracerEnvironment.testLevel}", - "configurations": { + "service" : "${tracerEnvironment.service}", + "env" : "${tracerEnvironment.env}", + "repository_url" : "${tracerEnvironment.repositoryUrl}", + "branch" : "${tracerEnvironment.branch}", + "sha" : "${tracerEnvironment.sha}", + "commit_message" : "${tracerEnvironment.commitMessage}", + "test_level" : "${tracerEnvironment.testLevel}", + "configurations" : { "os.platform" : "${tracerEnvironment.configurations.osPlatform}", "os.architecture" : "${tracerEnvironment.configurations.osArchitecture}", "os.arch" : "${tracerEnvironment.configurations.osArchitecture}", diff --git a/internal-api/src/main/java/datadog/trace/api/civisibility/config/LibraryCapability.java b/internal-api/src/main/java/datadog/trace/api/civisibility/config/LibraryCapability.java index 7e3980fc51f..7df45849286 100644 --- a/internal-api/src/main/java/datadog/trace/api/civisibility/config/LibraryCapability.java +++ b/internal-api/src/main/java/datadog/trace/api/civisibility/config/LibraryCapability.java @@ -1,22 +1,28 @@ package datadog.trace.api.civisibility.config; public enum LibraryCapability { - TIA("test_impact_analysis"), - EFD("early_flake_detection"), - ATR("auto_test_retries"), - IMPACTED("impacted_tests"), - FAIL_FAST("fail_fast_test_order"), - QUARANTINE("test_management.quarantine"), - DISABLED("test_management.disable"), - ATTEMPT_TO_FIX("test_management.attempt_to_fix"); + TIA("test_impact_analysis", "1"), + EFD("early_flake_detection", "1"), + ATR("auto_test_retries", "1"), + IMPACTED("impacted_tests", "1"), + FAIL_FAST("fail_fast_test_order", "1"), + QUARANTINE("test_management.quarantine", "1"), + DISABLED("test_management.disable", "1"), + ATTEMPT_TO_FIX("test_management.attempt_to_fix", "2"); private final String tag; + private final String version; - LibraryCapability(String tag) { + LibraryCapability(String tag, String version) { this.tag = tag; + this.version = version; } public String asTag() { return "_dd.library_capabilities." + tag; } + + public String getVersion() { + return version; + } } From 35028a52b02b52831e348cdad00a73a6e727fbcf Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Wed, 12 Mar 2025 11:51:58 +0100 Subject: [PATCH 2/5] smoke tests fixture update --- .../test-failed-flaky-retries/events.ftl | 70 ++++++------- .../events.ftl | 14 +-- .../events.ftl | 14 +-- .../events.ftl | 16 +-- .../resources/test-succeed-junit-5/events.ftl | 32 +++--- .../events.ftl | 28 +++--- .../coverages.ftl | 22 ++--- .../events.ftl | 30 +++--- .../coverages.ftl | 22 ++--- .../events.ftl | 30 +++--- .../events.ftl | 28 +++--- .../events.ftl | 28 +++--- .../events.ftl | 28 +++--- .../test-succeed-old-gradle/events.ftl | 28 +++--- .../events.ftl | 70 ++++++------- .../test_successful_maven_run/events.ftl | 28 +++--- .../events.ftl | 28 +++--- .../events.ftl | 28 +++--- .../events.ftl | 14 +-- .../events.ftl | 32 +++--- .../events.ftl | 28 +++--- .../events.ftl | 28 +++--- .../events.ftl | 98 +++++++++---------- .../events.ftl | 14 +-- .../events.ftl | 12 +-- .../events.ftl | 28 +++--- 26 files changed, 399 insertions(+), 399 deletions(-) diff --git a/dd-smoke-tests/gradle/src/test/resources/test-failed-flaky-retries/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-failed-flaky-retries/events.ftl index 80821a8a9c0..0be69f618b3 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 @@ -239,13 +239,13 @@ "duration" : ${content_duration_7}, "error" : 1, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "true", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -301,13 +301,13 @@ "duration" : ${content_duration_8}, "error" : 1, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "true", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -365,13 +365,13 @@ "duration" : ${content_duration_9}, "error" : 1, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "true", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_9}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -429,13 +429,13 @@ "duration" : ${content_duration_10}, "error" : 1, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "true", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_10}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -493,13 +493,13 @@ "duration" : ${content_duration_11}, "error" : 1, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "true", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_11}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, diff --git a/dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/events.ftl index c60d70b9b19..d39acb2c290 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-failed-legacy-instrumentation/events.ftl @@ -187,13 +187,13 @@ "duration" : ${content_duration_6}, "error" : 1, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_6}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, diff --git a/dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/events.ftl index 2eff4d5848a..ed2f768404d 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/events.ftl @@ -239,13 +239,13 @@ "duration" : ${content_duration_7}, "error" : 1, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-gradle-plugin-test/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-gradle-plugin-test/events.ftl index 3462c439bd2..171db88f8f7 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-gradle-plugin-test/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-gradle-plugin-test/events.ftl @@ -233,14 +233,14 @@ "duration" : ${content_duration_7}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.fail_fast_test_order" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.fail_fast_test_order" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/events.ftl index 5807153d23d..2ccf73e373a 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/events.ftl @@ -235,14 +235,14 @@ "duration" : ${content_duration_7}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.fail_fast_test_order" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.fail_fast_test_order" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -296,14 +296,14 @@ "duration" : ${content_duration_8}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.fail_fast_test_order" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.fail_fast_test_order" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/events.ftl index e67352e1531..cd356199d77 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-legacy-instrumentation/events.ftl @@ -185,13 +185,13 @@ "duration" : ${content_duration_6}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_6}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -245,13 +245,13 @@ "duration" : ${content_duration_7}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/coverages.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/coverages.ftl index 2fe41431bbf..567ef02b425 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/coverages.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/coverages.ftl @@ -1,15 +1,4 @@ [ { - "files" : [ { - "bitmap" : "gAw=", - "filename" : "src/test/java/datadog/smoke/TestSucceed.java" - }, { - "bitmap" : "IA==", - "filename" : "src/main/java/datadog/smoke/Calculator.java" - } ], - "span_id" : ${content_span_id_4}, - "test_session_id" : ${content_test_session_id}, - "test_suite_id" : ${content_test_suite_id} -}, { "files" : [ { "bitmap" : "AAE=", "filename" : "src/main/java/datadog/smoke/Calculator.java" @@ -20,4 +9,15 @@ "span_id" : ${content_span_id_5}, "test_session_id" : ${content_test_session_id}, "test_suite_id" : ${content_test_suite_id_2} +}, { + "files" : [ { + "bitmap" : "gAw=", + "filename" : "src/test/java/datadog/smoke/TestSucceed.java" + }, { + "bitmap" : "IA==", + "filename" : "src/main/java/datadog/smoke/Calculator.java" + } ], + "span_id" : ${content_span_id_4}, + "test_session_id" : ${content_test_session_id}, + "test_suite_id" : ${content_test_suite_id} } ] \ No newline at end of file diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/events.ftl index 3357f857988..6e69dc1d8fc 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-legacy-instrumentation/events.ftl @@ -184,13 +184,13 @@ "duration" : ${content_duration_6}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_6}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -292,14 +292,14 @@ "duration" : ${content_duration_8}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.fail_fast_test_order" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.fail_fast_test_order" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/coverages.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/coverages.ftl index 567ef02b425..2fe41431bbf 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/coverages.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/coverages.ftl @@ -1,15 +1,4 @@ [ { - "files" : [ { - "bitmap" : "AAE=", - "filename" : "src/main/java/datadog/smoke/Calculator.java" - }, { - "bitmap" : "AAw=", - "filename" : "src/test/java/datadog/smoke/TestSucceedJunit5.java" - } ], - "span_id" : ${content_span_id_5}, - "test_session_id" : ${content_test_session_id}, - "test_suite_id" : ${content_test_suite_id_2} -}, { "files" : [ { "bitmap" : "gAw=", "filename" : "src/test/java/datadog/smoke/TestSucceed.java" @@ -20,4 +9,15 @@ "span_id" : ${content_span_id_4}, "test_session_id" : ${content_test_session_id}, "test_suite_id" : ${content_test_suite_id} +}, { + "files" : [ { + "bitmap" : "AAE=", + "filename" : "src/main/java/datadog/smoke/Calculator.java" + }, { + "bitmap" : "AAw=", + "filename" : "src/test/java/datadog/smoke/TestSucceedJunit5.java" + } ], + "span_id" : ${content_span_id_5}, + "test_session_id" : ${content_test_session_id}, + "test_suite_id" : ${content_test_suite_id_2} } ] \ No newline at end of file diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/events.ftl index 9d66aab6ad6..f6787d25b40 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/events.ftl @@ -233,13 +233,13 @@ "duration" : ${content_duration_7}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -341,14 +341,14 @@ "duration" : ${content_duration_9}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.fail_fast_test_order" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.fail_fast_test_order" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_9}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/events.ftl index c9d9587c30f..86c8cfc55c6 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-legacy-instrumentation/events.ftl @@ -191,13 +191,13 @@ "duration" : ${content_duration_5}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_5}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -251,13 +251,13 @@ "duration" : ${content_duration_6}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_6}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/events.ftl index a8d9cb20ab2..fb292803f29 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/events.ftl @@ -240,13 +240,13 @@ "duration" : ${content_duration_6}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_6}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -300,13 +300,13 @@ "duration" : ${content_duration_7}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/events.ftl index 460c9fe9d6c..8ed830161db 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/events.ftl @@ -235,13 +235,13 @@ "duration" : ${content_duration_7}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -295,13 +295,13 @@ "duration" : ${content_duration_8}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/events.ftl index 23d159025ef..b3be4e67298 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-old-gradle/events.ftl @@ -185,13 +185,13 @@ "duration" : ${content_duration_6}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_6}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -245,13 +245,13 @@ "duration" : ${content_duration_7}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "false", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_7}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, diff --git a/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_failed_maven_run_flaky_retries/events.ftl index 94e172a837f..3dcdf89901a 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 @@ -305,13 +305,13 @@ "duration" : ${content_duration_9}, "error" : 1, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "true", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "false", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_9}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -367,13 +367,13 @@ "duration" : ${content_duration_10}, "error" : 1, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "true", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "false", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_10}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -431,13 +431,13 @@ "duration" : ${content_duration_11}, "error" : 1, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "true", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "false", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_11}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -495,13 +495,13 @@ "duration" : ${content_duration_12}, "error" : 1, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "true", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "false", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_12}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -559,13 +559,13 @@ "duration" : ${content_duration_13}, "error" : 1, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "true", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "false", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_13}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/events.ftl index c4515a48f24..028ae502e83 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run/events.ftl @@ -309,13 +309,13 @@ "duration" : ${content_duration_9}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_9}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -369,13 +369,13 @@ "duration" : ${content_duration_10}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_10}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/events.ftl index f2646014b9d..9c08cc57fe1 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_builtin_coverage/events.ftl @@ -273,13 +273,13 @@ "duration" : ${content_duration_8}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -333,13 +333,13 @@ "duration" : ${content_duration_9}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_9}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_impacted_tests/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_impacted_tests/events.ftl index 7a4cb662146..73aba91b29f 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_impacted_tests/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_impacted_tests/events.ftl @@ -271,13 +271,13 @@ "duration" : ${content_duration_8}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -332,13 +332,13 @@ "duration" : ${content_duration_9}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_9}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/events.ftl index a4006651801..721fc4e239a 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_junit_platform_runner/events.ftl @@ -326,13 +326,13 @@ "duration" : ${content_duration_10}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "false", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_10}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/events.ftl index 67ef45ed060..8affc7a1319 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_multiple_forks/events.ftl @@ -309,14 +309,14 @@ "duration" : ${content_duration_9}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.fail_fast_test_order" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.fail_fast_test_order" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_9}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -370,14 +370,14 @@ "duration" : ${content_duration_10}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.fail_fast_test_order" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.fail_fast_test_order" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_10}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/events.ftl index c4515a48f24..028ae502e83 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_0_0/events.ftl @@ -309,13 +309,13 @@ "duration" : ${content_duration_9}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_9}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -369,13 +369,13 @@ "duration" : ${content_duration_10}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_10}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/events.ftl index c4515a48f24..028ae502e83 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_surefire_3_5_0/events.ftl @@ -309,13 +309,13 @@ "duration" : ${content_duration_9}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_9}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -369,13 +369,13 @@ "duration" : ${content_duration_10}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_10}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/events.ftl index 42cd14dc56e..da63275f2e9 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 @@ -273,13 +273,13 @@ "duration" : ${content_duration_8}, "error" : 1, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "true", - "_dd.library_capabilities.test_management.disable" : "true", - "_dd.library_capabilities.test_management.quarantine" : "true", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -337,13 +337,13 @@ "duration" : ${content_duration_9}, "error" : 1, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "true", - "_dd.library_capabilities.test_management.disable" : "true", - "_dd.library_capabilities.test_management.quarantine" : "true", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_9}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -403,13 +403,13 @@ "duration" : ${content_duration_10}, "error" : 1, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "true", - "_dd.library_capabilities.test_management.disable" : "true", - "_dd.library_capabilities.test_management.quarantine" : "true", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_10}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -469,13 +469,13 @@ "duration" : ${content_duration_11}, "error" : 1, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "true", - "_dd.library_capabilities.test_management.disable" : "true", - "_dd.library_capabilities.test_management.quarantine" : "true", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_11}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -535,13 +535,13 @@ "duration" : ${content_duration_12}, "error" : 1, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "true", - "_dd.library_capabilities.test_management.disable" : "true", - "_dd.library_capabilities.test_management.quarantine" : "true", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_12}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -602,13 +602,13 @@ "duration" : ${content_duration_13}, "error" : 1, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "true", - "_dd.library_capabilities.test_management.disable" : "true", - "_dd.library_capabilities.test_management.quarantine" : "true", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_13}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -713,13 +713,13 @@ "duration" : ${content_duration_15}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "true", - "_dd.library_capabilities.test_management.disable" : "true", - "_dd.library_capabilities.test_management.quarantine" : "true", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_15}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/events.ftl index 3b1e2230da5..43bcef123f8 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_arg_line_property/events.ftl @@ -265,13 +265,13 @@ "duration" : ${content_duration_8}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "false", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_8}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/events.ftl index bc6b96c9fe9..608a5ed70e7 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_cucumber/events.ftl @@ -363,12 +363,12 @@ "duration" : ${content_duration_11}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.test_impact_analysis" : "false", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_11}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, diff --git a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/events.ftl b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/events.ftl index 521e50ac686..15425720a16 100644 --- a/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/events.ftl +++ b/dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_with_jacoco_and_argline/events.ftl @@ -309,13 +309,13 @@ "duration" : ${content_duration_9}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_9}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, @@ -369,13 +369,13 @@ "duration" : ${content_duration_10}, "error" : 0, "meta" : { - "_dd.library_capabilities.auto_test_retries" : "false", - "_dd.library_capabilities.early_flake_detection" : "false", - "_dd.library_capabilities.impacted_tests" : "true", - "_dd.library_capabilities.test_impact_analysis" : "true", - "_dd.library_capabilities.test_management.attempt_to_fix" : "false", - "_dd.library_capabilities.test_management.disable" : "false", - "_dd.library_capabilities.test_management.quarantine" : "false", + "_dd.library_capabilities.auto_test_retries" : "1", + "_dd.library_capabilities.early_flake_detection" : "1", + "_dd.library_capabilities.impacted_tests" : "1", + "_dd.library_capabilities.test_impact_analysis" : "1", + "_dd.library_capabilities.test_management.attempt_to_fix" : "2", + "_dd.library_capabilities.test_management.disable" : "1", + "_dd.library_capabilities.test_management.quarantine" : "1", "_dd.p.tid" : ${content_meta__dd_p_tid_10}, "_dd.test.is_user_provided_service" : "true", "_dd.tracer_host" : ${content_meta__dd_tracer_host}, From 7de420cab33f553fc595ffa5bcf69ca3a20bf305 Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Wed, 12 Mar 2025 12:04:51 +0100 Subject: [PATCH 3/5] fix tests --- .../civisibility/domain/buildsystem/ProxyTestModuleTest.groovy | 2 +- .../civisibility/domain/headless/HeadlessTestModuleTest.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 006fe2b9c66..cd8492ce566 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 @@ -52,7 +52,7 @@ class ProxyTestModuleTest extends DDSpecification { Stub(CoverageStore.Factory), Stub(ChildProcessCoverageReporter), GroovyMock(SignalClient.Factory), - [:] + [] ) when: diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/headless/HeadlessTestModuleTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/headless/HeadlessTestModuleTest.groovy index 57924803cd3..192b77374e7 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/headless/HeadlessTestModuleTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/headless/HeadlessTestModuleTest.groovy @@ -66,7 +66,7 @@ class HeadlessTestModuleTest extends SpanWriterTest { Stub(LinesResolver), Stub(CoverageStore.Factory), executionStrategy, - [:], + [], (span) -> { } ) } From 1e4cb8f7d0aadd33f3b934815a23f67dd7a91614 Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Wed, 12 Mar 2025 12:08:19 +0100 Subject: [PATCH 4/5] fix spotless --- .../datadog/trace/civisibility/config/ExecutionSettings.java | 3 --- .../main/java/datadog/trace/civisibility/domain/TestImpl.java | 1 - .../java/datadog/trace/civisibility/domain/TestSuiteImpl.java | 1 - .../trace/civisibility/domain/buildsystem/ProxyTestModule.java | 1 - .../civisibility/domain/buildsystem/ProxyTestSession.java | 1 - .../trace/civisibility/domain/headless/HeadlessTestModule.java | 1 - .../civisibility/domain/headless/HeadlessTestSession.java | 1 - .../datadog/trace/civisibility/domain/TestImplTest.groovy | 3 ++- 8 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettings.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettings.java index 3803bdf53f7..4d93dcf5d38 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettings.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ExecutionSettings.java @@ -1,8 +1,5 @@ package datadog.trace.civisibility.config; -import datadog.trace.api.Config; -import datadog.trace.api.civisibility.CIConstants; -import datadog.trace.api.civisibility.config.LibraryCapability; import datadog.trace.api.civisibility.config.TestFQN; import datadog.trace.api.civisibility.config.TestIdentifier; import datadog.trace.api.civisibility.config.TestMetadata; diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java index 22d6b98a294..3bb5054dee0 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java @@ -45,7 +45,6 @@ import java.lang.reflect.Method; import java.util.Collection; import java.util.Collections; -import java.util.Map; import java.util.function.Consumer; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java index 26614293932..0ba81176691 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestSuiteImpl.java @@ -26,7 +26,6 @@ import datadog.trace.civisibility.utils.SpanUtils; import java.lang.reflect.Method; import java.util.Collection; -import java.util.Map; import java.util.function.Consumer; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestModule.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestModule.java index 8d3e433650e..bd50ba88dc3 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestModule.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestModule.java @@ -31,7 +31,6 @@ import datadog.trace.civisibility.test.ExecutionResults; import datadog.trace.civisibility.test.ExecutionStrategy; import java.util.Collection; -import java.util.Map; import java.util.TreeSet; import java.util.concurrent.ConcurrentHashMap; import javax.annotation.Nonnull; diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestSession.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestSession.java index 7a851533d99..aefb9f05d4b 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestSession.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/ProxyTestSession.java @@ -16,7 +16,6 @@ import datadog.trace.civisibility.source.SourcePathResolver; import datadog.trace.civisibility.test.ExecutionStrategy; import java.util.Collection; -import java.util.Map; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java index fd55662897d..65a75ed685a 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java @@ -29,7 +29,6 @@ import datadog.trace.civisibility.test.ExecutionStrategy; import datadog.trace.civisibility.utils.SpanUtils; import java.util.Collection; -import java.util.Map; import java.util.function.Consumer; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java index 8319d4829df..a499793115b 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java @@ -22,7 +22,6 @@ import datadog.trace.civisibility.utils.SpanUtils; import java.util.Collection; import java.util.Collections; -import java.util.Map; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy index 769cbec3ffb..eac92fa8474 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/domain/TestImplTest.groovy @@ -118,7 +118,8 @@ class TestImplTest extends SpanWriterTest { LibraryCapability.EFD, LibraryCapability.QUARANTINE, LibraryCapability.DISABLED, - LibraryCapability.ATTEMPT_TO_FIX] + LibraryCapability.ATTEMPT_TO_FIX + ] new TestImpl( moduleSpanContext, From f26a2854234004c4cac6f4a5e707509c01661933 Mon Sep 17 00:00:00 2001 From: Daniel Mohedano Date: Wed, 12 Mar 2025 13:17:13 +0100 Subject: [PATCH 5/5] creates test management dto for request instead of tracer environment --- .../config/ConfigurationApiImpl.java | 36 +++++++++++++++++-- .../config/TracerEnvironment.java | 11 ------ .../config/test-management-tests-request.ftl | 21 +---------- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationApiImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationApiImpl.java index b9314005bee..2098ce9d87b 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationApiImpl.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/ConfigurationApiImpl.java @@ -1,6 +1,7 @@ package datadog.trace.civisibility.config; import com.squareup.moshi.FromJson; +import com.squareup.moshi.Json; import com.squareup.moshi.JsonAdapter; import com.squareup.moshi.Moshi; import com.squareup.moshi.ToJson; @@ -65,6 +66,7 @@ public class ConfigurationApiImpl implements ConfigurationApi { private final JsonAdapter> settingsResponseAdapter; private final JsonAdapter> testIdentifiersResponseAdapter; private final JsonAdapter> testFullNamesResponseAdapter; + private final JsonAdapter> testManagementRequestAdapter; private final JsonAdapter> testManagementTestsResponseAdapter; private final JsonAdapter> changedFilesResponseAdapter; @@ -108,6 +110,11 @@ public ConfigurationApiImpl(BackendApi backendApi, CiVisibilityMetricCollector m ConfigurationApiImpl.class, EnvelopeDto.class, KnownTestsDto.class); testFullNamesResponseAdapter = moshi.adapter(testFullNamesResponseType); + ParameterizedType testManagementRequestType = + Types.newParameterizedTypeWithOwner( + ConfigurationApiImpl.class, EnvelopeDto.class, TestManagementDto.class); + testManagementRequestAdapter = moshi.adapter(testManagementRequestType); + ParameterizedType testManagementTestsResponseType = Types.newParameterizedTypeWithOwner( ConfigurationApiImpl.class, EnvelopeDto.class, TestManagementTestsDto.class); @@ -329,9 +336,16 @@ public Map>> getTestManagementTests .build(); String uuid = uuidGenerator.get(); - EnvelopeDto request = - new EnvelopeDto<>(new DataDto<>(uuid, "ci_app_libraries_tests_request", tracerEnvironment)); - String json = requestAdapter.toJson(request); + EnvelopeDto request = + new EnvelopeDto<>( + new DataDto<>( + uuid, + "ci_app_libraries_tests_request", + new TestManagementDto( + tracerEnvironment.getRepositoryUrl(), + tracerEnvironment.getCommitMessage(), + tracerEnvironment.getConfigurations().getTestBundle()))); + String json = testManagementRequestAdapter.toJson(request); RequestBody requestBody = RequestBody.create(JSON, json); TestManagementTestsDto testManagementTestsDto = backendApi.post( @@ -520,6 +534,22 @@ private KnownTestsDto(Map>> tests) { } } + private static final class TestManagementDto { + @Json(name = "repository_url") + private final String repositoryUrl; + + @Json(name = "commit_message") + private final String commitMessage; + + private final String module; + + private TestManagementDto(String repositoryUrl, String commitMessage, String module) { + this.repositoryUrl = repositoryUrl; + this.commitMessage = commitMessage; + this.module = module; + } + } + private static final class TestManagementTestsDto { private static final class Properties { private final Map properties; diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TracerEnvironment.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TracerEnvironment.java index 169ce6147ca..a405902bd2c 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TracerEnvironment.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/TracerEnvironment.java @@ -22,7 +22,6 @@ public class TracerEnvironment { @Json(name = "test_level") private final String testLevel = "test"; - private final String module; private final Configurations configurations; private TracerEnvironment( @@ -32,7 +31,6 @@ private TracerEnvironment( String branch, String sha, String commitMessage, - String module, Configurations configurations) { this.service = service; this.env = env; @@ -40,7 +38,6 @@ private TracerEnvironment( this.branch = branch; this.sha = sha; this.commitMessage = commitMessage; - this.module = module; this.configurations = configurations; } @@ -72,10 +69,6 @@ public String getTestLevel() { return testLevel; } - public String getModule() { - return module; - } - public Configurations getConfigurations() { return configurations; } @@ -104,9 +97,6 @@ public String toString() { + ", testLevel='" + testLevel + '\'' - + ", module='" - + module - + '\'' + ", configurations=" + configurations + '}'; @@ -216,7 +206,6 @@ public TracerEnvironment build() { branch, sha, commitMessage, - testBundle, new Configurations( osPlatform, osArchitecture, diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/datadog/trace/civisibility/config/test-management-tests-request.ftl b/dd-java-agent/agent-ci-visibility/src/test/resources/datadog/trace/civisibility/config/test-management-tests-request.ftl index 088905cca4a..d16b3e43c8d 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/resources/datadog/trace/civisibility/config/test-management-tests-request.ftl +++ b/dd-java-agent/agent-ci-visibility/src/test/resources/datadog/trace/civisibility/config/test-management-tests-request.ftl @@ -3,27 +3,8 @@ "type" : "ci_app_libraries_tests_request", "id" : "${uid}", "attributes": { - "service" : "${tracerEnvironment.service}", - "env" : "${tracerEnvironment.env}", "repository_url" : "${tracerEnvironment.repositoryUrl}", - "branch" : "${tracerEnvironment.branch}", - "sha" : "${tracerEnvironment.sha}", - "commit_message" : "${tracerEnvironment.commitMessage}", - "test_level" : "${tracerEnvironment.testLevel}", - "configurations" : { - "os.platform" : "${tracerEnvironment.configurations.osPlatform}", - "os.architecture" : "${tracerEnvironment.configurations.osArchitecture}", - "os.arch" : "${tracerEnvironment.configurations.osArchitecture}", - "os.version" : "${tracerEnvironment.configurations.osVersion}", - "runtime.name" : "${tracerEnvironment.configurations.runtimeName}", - "runtime.version" : "${tracerEnvironment.configurations.runtimeVersion}", - "runtime.vendor" : "${tracerEnvironment.configurations.runtimeVendor}", - "runtime.architecture": "${tracerEnvironment.configurations.runtimeArchitecture}", - "custom" : { - <#list tracerEnvironment.configurations.custom as customTag, customValue> - "${customTag}": "${customValue}"<#if customTag?has_next>, - - } + "commit_message" : "${tracerEnvironment.commitMessage}" } } }