Merge pull request #362 from DataDog/mar-kolya/enable-coverage-in-CI

Enable coverage checks in CI for java8

.circleci/config.yml

@@ -116,7 +116,8 @@ jobs:
     <<: *default_test_job
     environment:
       - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
-      - TEST_TASK: test latestDepTest
+      # Tests under Java8 should have complete coverage.
+      - TEST_TASK: test latestDepTest jacocoTestCoverageVerification jacocoTestReport
 
   test_9:
     <<: *default_test_job
@@ -125,13 +126,12 @@ jobs:
       - TEST_TASK: testJava9 latestDepTestJava9
       - INSTALL_ZULU: zulu-9
 
-
   agent_integration_tests:
     <<: *defaults
     docker:
       - image: circleci/openjdk:8-jdk
       - image: datadog/docker-dd-agent
-        env:
+        environment:
           - DD_APM_ENABLED=true
           - DD_BIND_HOST=0.0.0.0
           - DD_API_KEY=invalid_key_but_this_is_fine

dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceAsyncClientTest.groovy

@@ -54,6 +54,8 @@ class LettuceAsyncClientTest extends AgentTestRunner {
   @Shared
   RedisClient redisClient = RedisClient.create(EMBEDDED_DB_URI)
 
+  @Shared
+  StatefulConnection connection
   @Shared
   RedisAsyncCommands<String, ?> asyncCommands = null
 
@@ -67,11 +69,14 @@ class LettuceAsyncClientTest extends AgentTestRunner {
   def setupSpec() {
     println "Using redis: $redisServer.args"
     redisServer.start()
-    StatefulConnection connection = redisClient.connect()
+    connection = redisClient.connect()
     asyncCommands = connection.async()
+    TEST_WRITER.waitForTraces(1)
+    TEST_WRITER.clear()
   }
 
   def cleanupSpec() {
+    connection.close()
     redisServer.stop()
   }
 

dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceReactiveClientTest.groovy

@@ -37,17 +37,22 @@ class LettuceReactiveClientTest extends AgentTestRunner {
   @Shared
   RedisClient redisClient = RedisClient.create(EMBEDDED_DB_URI)
 
+  @Shared
+  StatefulConnection connection
   @Shared
   RedisReactiveCommands<String, ?> reactiveCommands = null
 
   def setupSpec() {
     println "Using redis: $redisServer.args"
     redisServer.start()
-    StatefulConnection connection = redisClient.connect()
+    connection = redisClient.connect()
     reactiveCommands = connection.reactive()
+    TEST_WRITER.waitForTraces(1)
+    TEST_WRITER.clear()
   }
 
   def cleanupSpec() {
+    connection.close()
     redisServer.stop()
   }
   

dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceSyncClientTest.groovy

@@ -42,6 +42,8 @@ class LettuceSyncClientTest extends AgentTestRunner {
   @Shared
   RedisClient redisClient = RedisClient.create(EMBEDDED_DB_URI)
 
+  @Shared
+  StatefulConnection connection
   @Shared
   RedisCommands<String, ?> syncCommands = null
 
@@ -54,11 +56,14 @@ class LettuceSyncClientTest extends AgentTestRunner {
 
   def setupSpec() {
     redisServer.start()
-    StatefulConnection connection = redisClient.connect()
+    connection = redisClient.connect()
     syncCommands = connection.sync()
+    TEST_WRITER.waitForTraces(1)
+    TEST_WRITER.clear()
   }
 
   def cleanupSpec() {
+    connection.close()
     redisServer.stop()
   }