open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Fix setup so springweb tests produce appropriate logs
This commit is contained in:
Nikolay Martynov 2018-11-21 16:56:39 -05:00 committed by GitHub
parent f6bdb5503b fdffee8f5c
commit e7f4385b0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
dd-java-agent/instrumentation/spring-web/spring-web.gradle
View File

@ -32,7 +32,7 @@ dependencies {
testCompile group: 'javax.validation', name: 'validation-api', version: '1.1.0.Final' 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.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-test', version: '1.5.17.RELEASE'
testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '1.5.17.RELEASE' testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '1.5.17.RELEASE'

18
dd-java-agent/instrumentation/spring-web/src/test/resources/logback.xml Normal file
View File

@ -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>