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 nightly build failure (#1234)

This commit is contained in:
Nikita Salnikov-Tarnovski 2020-09-22 11:57:19 +03:00 committed by GitHub
parent f76fb756be
commit f76473de92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
instrumentation/elasticsearch/elasticsearch-rest-5.0/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy
View File

@ -99,7 +99,6 @@ class Elasticsearch6RestClientTest extends AgentTestRunner {
spanKind INTERNAL spanKind INTERNAL
parent() parent()
attributes { attributes {
"${SemanticAttributes.NET_TRANSPORT.key()}" "IP.TCP"
"${SemanticAttributes.NET_PEER_NAME.key()}" httpTransportAddress.address "${SemanticAttributes.NET_PEER_NAME.key()}" httpTransportAddress.address
"${SemanticAttributes.NET_PEER_PORT.key()}" httpTransportAddress.port "${SemanticAttributes.NET_PEER_PORT.key()}" httpTransportAddress.port
"${SemanticAttributes.HTTP_URL.key()}" "_cluster/health" "${SemanticAttributes.HTTP_URL.key()}" "_cluster/health"
@ -112,6 +111,8 @@ class Elasticsearch6RestClientTest extends AgentTestRunner {
spanKind CLIENT spanKind CLIENT
childOf span(0) childOf span(0)
attributes { attributes {
"${SemanticAttributes.NET_TRANSPORT.key()}" "IP.TCP"
"${SemanticAttributes.HTTP_FLAVOR.key()}" "1.1"
"${SemanticAttributes.HTTP_URL.key()}" "_cluster/health" "${SemanticAttributes.HTTP_URL.key()}" "_cluster/health"
"${SemanticAttributes.HTTP_METHOD.key()}" "GET" "${SemanticAttributes.HTTP_METHOD.key()}" "GET"
"${SemanticAttributes.HTTP_STATUS_CODE.key()}" 200 "${SemanticAttributes.HTTP_STATUS_CODE.key()}" 200

2
instrumentation/elasticsearch/elasticsearch-rest-6.4/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy
View File

@ -104,7 +104,6 @@ class Elasticsearch6RestClientTest extends AgentTestRunner {
spanKind INTERNAL spanKind INTERNAL
parent() parent()
attributes { attributes {
"${SemanticAttributes.NET_TRANSPORT.key()}" "IP.TCP"
"${SemanticAttributes.NET_PEER_NAME.key()}" httpTransportAddress.address "${SemanticAttributes.NET_PEER_NAME.key()}" httpTransportAddress.address
"${SemanticAttributes.NET_PEER_PORT.key()}" httpTransportAddress.port "${SemanticAttributes.NET_PEER_PORT.key()}" httpTransportAddress.port
"${SemanticAttributes.HTTP_URL.key()}" "_cluster/health" "${SemanticAttributes.HTTP_URL.key()}" "_cluster/health"
@ -117,6 +116,7 @@ class Elasticsearch6RestClientTest extends AgentTestRunner {
spanKind CLIENT spanKind CLIENT
childOf span(0) childOf span(0)
attributes { attributes {
"${SemanticAttributes.NET_TRANSPORT.key()}" "IP.TCP"
"${SemanticAttributes.HTTP_URL.key()}" "_cluster/health" "${SemanticAttributes.HTTP_URL.key()}" "_cluster/health"
"${SemanticAttributes.HTTP_METHOD.key()}" "GET" "${SemanticAttributes.HTTP_METHOD.key()}" "GET"
"${SemanticAttributes.HTTP_STATUS_CODE.key()}" 200 "${SemanticAttributes.HTTP_STATUS_CODE.key()}" 200

4
instrumentation/log4j/log4j-2.7/log4j-2.7.gradle
View File

@ -9,7 +9,9 @@ muzzle {
} }
dependencies { dependencies {
library group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.7' compileOnly group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.7'
testImplementation project(':instrumentation:log4j:log4j-2-testing') testImplementation project(':instrumentation:log4j:log4j-2-testing')
latestDepTestLibrary group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.13.1'
} }