Skip to content

Add JDK 25-EA testing to CI #9140

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
sarahchen6 merged 9 commits into from
Jul 29, 2025
Merged

Add JDK 25-EA testing to CI #9140

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4d56262
Add 25 to test matrices
sarahchen6 Jul 9, 2025
5d0fa98
Skip gradle related test failures
sarahchen6 Jul 14, 2025
33dc1bb
Skip maven test failure
sarahchen6 Jul 14, 2025
06e3d00
Test java-concurrent-21 on Java 21-24 only
sarahchen6 Jul 14, 2025
b9e074d
Skip java-lang test failure
sarahchen6 Jul 14, 2025
bafac24
Skip log4j1 test failure
sarahchen6 Jul 14, 2025
0e1da3e
Remove 25 from default test JVMs
sarahchen6 Jul 14, 2025
6c321d5
Remove 25 from other default test JVMs
sarahchen6 Jul 15, 2025
eb324be
Merge branch 'master' into sarahchen6/try-jdk-25-image-and-tests
sarahchen6 Jul 21, 2025
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
Prev Previous commit
Next Next commit
Skip log4j1 test failure
  • Loading branch information
@sarahchen6
sarahchen6 committed Jul 14, 2025
commit bafac2465a468e683375ca8ba7504e2ae0d934e3
5 changes: 5 additions & 0 deletions dd-java-agent/instrumentation/log4j1/src/test/groovy/MdcTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
import datadog.environment.JavaVirtualMachine
import datadog.trace.agent.test.AgentTestRunner
import org.apache.log4j.Category
import org.apache.log4j.MDC
import org.apache.log4j.Priority
import org.apache.log4j.spi.LoggingEvent
import spock.lang.IgnoreIf

class MdcTest extends AgentTestRunner {
@IgnoreIf(reason = "TODO: Fix for Java 25.", value = {
JavaVirtualMachine.isJavaVersionAtLeast(25)
})

@bric3 bric3 Jul 29, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://datadoghq.atlassian.net/browse/LANGPLAT-706

def "should preserve mdc when logging injection is #injectionEnabled"() {
setup:
injectSysConfig("logs.injection", injectionEnabled)
Expand Down