From 44dc98200a1130de1b36d5c92749f6aaa77d4cfd Mon Sep 17 00:00:00 2001
From: Nikolay Martynov <mar.kolya@gmail.com>
Date: Wed, 18 Sep 2019 15:36:45 -0400
Subject: [PATCH 1/2] Enable tests for java13

---
 .circleci/config.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

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:

From 43603e970c166072b0a6a11fc583466dbcda0edd Mon Sep 17 00:00:00 2001
From: Nikolay Martynov <mar.kolya@gmail.com>
Date: Thu, 19 Sep 2019 08:27:56 -0400
Subject: [PATCH 2/2] Disable Log4j1 tests for java versions without '.'

Log4j1 seems to be broken on those.
---
 .../log4j1/src/test/groovy/Log4j1MDCTest.groovy            | 7 +++++++
 1 file changed, 7 insertions(+)

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