Skip to content

Workaround for latest maven-failsafe-plugin test #10659

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gh-worker-dd-mergequeue-cf854d merged 3 commits into from
Feb 23, 2026
+18 −18
Merged

Workaround for latest maven-failsafe-plugin test #10659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c443c5
fix: maven-failsafe-plugin 3.5.5 workaround
daniel-mohedano Feb 23, 2026
c39aeeb
Merge branch 'master' into daniel.mohedano/maven-integration-test-wor…
daniel-mohedano Feb 23, 2026
6fe1b50
chore: revert skips
daniel-mohedano Feb 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions dd-java-agent/instrumentation/maven/maven-3.2.1/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ muzzle {

addTestSuiteForDir('latestDepTest', 'test')

tasks.named("latestDepTest", Test) {
systemProperty 'test.isLatestDepTest', 'true'
}

dependencies {
compileOnly 'org.apache.maven:maven-embedder:3.2.1'

Expand Down
32 changes: 18 additions & 14 deletions ...a-agent/instrumentation/maven/maven-3.2.1/src/test/groovy/MavenInstrumentationTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ import datadog.trace.api.config.CiVisibilityConfig
import datadog.trace.civisibility.CiVisibilityInstrumentationTest
import org.apache.maven.cli.MavenCli
import org.codehaus.plexus.util.FileUtils
import org.slf4j.MDC
import spock.lang.TempDir

import java.nio.file.Path
import java.nio.file.Paths

import static org.junit.jupiter.api.Assertions.assertEquals
import static org.junit.jupiter.api.Assumptions.abort

class MavenInstrumentationTest extends CiVisibilityInstrumentationTest {

Expand All @@ -19,6 +19,14 @@ class MavenInstrumentationTest extends CiVisibilityInstrumentationTest {

@Override
def setup() {
// Workaround for maven-surefire 3.5.5 bug (https://github.com/apache/maven-surefire/pull/3241):
// ThreadedStreamConsumer$Pumper.run() calls MDC.setContextMap(MDC.getCopyOfContextMap()),
// but LogbackMDCAdapter.getCopyOfContextMap() returns null when MDC is uninitialized,
// and LogbackMDCAdapter.setContextMap(null) throws NPE via HashMap.putAll(null).
// Pre-initializing MDC ensures getCopyOfContextMap() returns an empty map instead of null.
MDC.put("_init", "true")
MDC.remove("_init")

System.setProperty("maven.multiModuleProjectDirectory", projectFolder.toAbsolutePath().toString())
givenMavenProjectFiles((String) specificationContext.currentIteration.dataVariables.testcaseName)
givenMavenDependenciesAreLoaded()
Expand All @@ -32,10 +40,6 @@ class MavenInstrumentationTest extends CiVisibilityInstrumentationTest {
}

def "test #testcaseName"() {
if (skipLatest && Boolean.getBoolean("test.isLatestDepTest")) {
abort("Skipping latest dep test")
}

String workingDirectory = projectFolder.toString()

def exitCode = new MavenCli().doMain(args.toArray(new String[0]), workingDirectory, null, null)
Expand All @@ -44,15 +48,15 @@ class MavenInstrumentationTest extends CiVisibilityInstrumentationTest {
assertSpansData(testcaseName)

where:
testcaseName | args | expectedExitCode | skipLatest
"test_maven_build_with_no_tests_generates_spans" | ["-B", "verify"] | 0 | false
"test_maven_build_with_incorrect_command_generates_spans" | ["-B", "unknownPhase"] | 1 | false
"test_maven_build_with_tests_generates_spans" | ["-B", "clean", "test"] | 0 | false
"test_maven_build_with_failed_tests_generates_spans" | ["-B", "clean", "test"] | 1 | false
"test_maven_build_with_tests_in_multiple_modules_generates_spans" | ["-B", "clean", "test"] | 1 | false
"test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans" | ["-B", "-T4", "clean", "test"] | 0 | false
"test_maven_build_with_unit_and_integration_tests_generates_spans" | ["-B", "verify"] | 0 | true // temporary workaround to avoid failures with maven-failsafe-plugin 3.5.5
"test_maven_build_with_no_fork_generates_spans" | ["-B", "clean", "test"] | 0 | false
testcaseName | args | expectedExitCode
"test_maven_build_with_no_tests_generates_spans" | ["-B", "verify"] | 0
"test_maven_build_with_incorrect_command_generates_spans" | ["-B", "unknownPhase"] | 1
"test_maven_build_with_tests_generates_spans" | ["-B", "clean", "test"] | 0
"test_maven_build_with_failed_tests_generates_spans" | ["-B", "clean", "test"] | 1
"test_maven_build_with_tests_in_multiple_modules_generates_spans" | ["-B", "clean", "test"] | 1
"test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans" | ["-B", "-T4", "clean", "test"] | 0
"test_maven_build_with_unit_and_integration_tests_generates_spans" | ["-B", "verify"] | 0
"test_maven_build_with_no_fork_generates_spans" | ["-B", "clean", "test"] | 0
}

private void givenMavenProjectFiles(String projectFilesSources) {
Expand Down