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

fix master build fail due to latestDepTest (#1554)

This commit is contained in:
Jakub Wach 2020-11-04 15:21:29 +01:00 committed by GitHub
parent 049358e81b
commit 81101ed463
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
instrumentation/apache-camel-2.20/apache-camel-2.20.gradle
View File

@ -15,6 +15,12 @@ muzzle {
dependencies {
library group: 'org.apache.camel', name: 'camel-core', version: '2.20.1'
testLibrary group: 'org.apache.camel', name: 'camel-spring-boot-starter', version: '2.20.1'
testLibrary group: 'org.apache.camel', name: 'camel-jetty-starter', version: '2.20.1'
testLibrary group: 'org.apache.camel', name: 'camel-http-starter', version: '2.20.1'
testLibrary group: 'org.apache.camel', name: 'camel-jaxb-starter', version: '2.20.1'
testLibrary group: 'org.apache.camel', name: 'camel-undertow', version: '2.20.1'
testImplementation project(':instrumentation:apache-httpclient:apache-httpclient-2.0')
testImplementation project(':instrumentation:servlet:servlet-3.0')
@ -23,13 +29,12 @@ dependencies {
testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '1.5.17.RELEASE'
testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter', version: '1.5.17.RELEASE'
testImplementation group: 'org.apache.camel', name: 'camel-spring-boot-starter', version: '2.20.1'
testImplementation group: 'org.apache.camel', name: 'camel-jetty-starter', version: '2.20.1'
testImplementation group: 'org.apache.camel', name: 'camel-http-starter', version: '2.20.1'
testImplementation group: 'org.apache.camel', name: 'camel-jaxb-starter', version: '2.20.1'
testImplementation group: 'org.apache.camel', name: 'camel-undertow', version: '2.20.1'
testImplementation 'javax.xml.bind:jaxb-api:2.3.1'
latestDepTestLibrary group: 'org.apache.camel', name: 'camel-core', version: '2.+'
latestDepTestLibrary group: 'org.apache.camel', name: 'camel-spring-boot-starter', version: '2.+'
latestDepTestLibrary group: 'org.apache.camel', name: 'camel-jetty-starter', version: '2.+'
latestDepTestLibrary group: 'org.apache.camel', name: 'camel-http-starter', version: '2.+'
latestDepTestLibrary group: 'org.apache.camel', name: 'camel-jaxb-starter', version: '2.+'
latestDepTestLibrary group: 'org.apache.camel', name: 'camel-undertow', version: '2.+'
}

2
instrumentation/apache-camel-2.20/src/test/groovy/test/RestCamelTest.groovy
View File

@ -88,7 +88,7 @@ class RestCamelTest extends AgentTestRunner {
"$SemanticAttributes.HTTP_URL.key" "http://localhost:$port/api/firstModule/unit/unitOne"
"$SemanticAttributes.HTTP_STATUS_CODE.key" 200
"$SemanticAttributes.HTTP_CLIENT_IP.key" "127.0.0.1"
"$SemanticAttributes.HTTP_USER_AGENT.key" "Jetty/9.3.21.v20170918"
"$SemanticAttributes.HTTP_USER_AGENT.key" String
"$SemanticAttributes.HTTP_FLAVOR.key" "HTTP/1.1"
"$SemanticAttributes.HTTP_METHOD.key" "GET"
"$SemanticAttributes.NET_PEER_IP.key" "127.0.0.1"