Merge pull request #592 from DataDog/mar-kolya/fix-springweb-tests-logs

Fix setup so springweb tests produce appropriate logs

dd-java-agent/instrumentation/hystrix-1.4/src/test/groovy/HystrixTest.groovy

@@ -86,7 +86,7 @@ class HystrixTest extends AgentTestRunner {
       cmd.observe().subscribe { next ->
         queue.put(next)
       }
-      queue.poll()
+      queue.take()
     }
   }
 

dd-java-agent/instrumentation/spring-web/spring-web.gradle

@@ -32,7 +32,7 @@ dependencies {
   testCompile group: 'javax.validation', name: 'validation-api', version: '1.1.0.Final'
   testCompile group: 'org.hibernate', name: 'hibernate-validator', version: '5.4.2.Final'
 
-  testCompile group: 'org.spockframework', name: 'spock-spring', version: '1.1-groovy-2.4'
+  testCompile group: 'org.spockframework', name: 'spock-spring', version: "$versions.spock"
 
   testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '1.5.17.RELEASE'
   testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '1.5.17.RELEASE'

dd-java-agent/instrumentation/spring-web/src/test/resources/logback.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+  <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+    <layout class="ch.qos.logback.classic.PatternLayout">
+      <Pattern>
+        %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+      </Pattern>
+    </layout>
+  </appender>
+
+  <root level="WARN">
+    <appender-ref ref="console"/>
+  </root>
+
+  <logger name="datadog" level="debug"/>
+
+</configuration>