diff --git a/.circleci/config.yml b/.circleci/config.yml index 922abba347..6932ad2a45 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -137,6 +137,11 @@ jobs: environment: - TEST_TASK: testJava12 + test_13: + <<: *default_test_job + environment: + - TEST_TASK: testJava13 + agent_integration_tests: <<: *defaults docker: @@ -314,6 +319,12 @@ workflows: filters: tags: only: /.*/ + - test_13: + requires: + - build + filters: + tags: + only: /.*/ - agent_integration_tests: requires: @@ -348,6 +359,7 @@ workflows: - test_11 - test_zulu11 - test_12 + - test_13 - agent_integration_tests - check filters: @@ -368,6 +380,7 @@ workflows: - test_11 - test_zulu11 - test_12 + - test_13 - agent_integration_tests - check filters: diff --git a/dd-java-agent/instrumentation/log4j1/src/test/groovy/Log4j1MDCTest.groovy b/dd-java-agent/instrumentation/log4j1/src/test/groovy/Log4j1MDCTest.groovy index 24a9c3264e..f2e37740f9 100644 --- a/dd-java-agent/instrumentation/log4j1/src/test/groovy/Log4j1MDCTest.groovy +++ b/dd-java-agent/instrumentation/log4j1/src/test/groovy/Log4j1MDCTest.groovy @@ -1,6 +1,13 @@ import datadog.trace.agent.test.log.injection.LogContextInjectionTestBase import org.apache.log4j.MDC +import spock.lang.Requires +/** + It looks like log4j1 is broken for any java version that doesn't have '.' in version number + - it thinks it runs on ancient version. For example this happens for java13. + See {@link org.apache.log4j.helpers.Loader}. + */ +@Requires({ System.getProperty("java.version").contains(".") }) class Log4j1MDCTest extends LogContextInjectionTestBase { @Override