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

Remove leftover google.com references. (#3243)

This commit is contained in:
Anuraag Agrawal 2021-06-11 11:04:41 +09:00 committed by GitHub
parent 60aaff8972
commit d44cf56636
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpClientTest.groovy
View File

@ -903,7 +903,7 @@ abstract class HttpClientTest<REQUEST> extends InstrumentationSpecification {
}
attributes {
"${SemanticAttributes.NET_TRANSPORT.key}" IP_TCP
if (uri.port == UNUSABLE_PORT || uri.host == "192.0.2.1" || (uri.host == "www.google.com" && uri.port == 81)) {
if (uri.port == UNUSABLE_PORT || uri.host == "192.0.2.1") {
// TODO(anuraaga): For theses cases, there isn't actually a peer so we shouldn't be
// filling in peer information but some instrumentation does so based on the URL itself
// which is present in HTTP attributes. We should fix this.
@ -913,12 +913,7 @@ abstract class HttpClientTest<REQUEST> extends InstrumentationSpecification {
"${SemanticAttributes.NET_PEER_NAME.key}" uri.host
"${SemanticAttributes.NET_PEER_PORT.key}" uri.port > 0 ? uri.port : { it == null || it == 443 }
}
if (uri.host == "www.google.com") {
// unpredictable IP address (or can be none if no connection is made, see comment above)
"${SemanticAttributes.NET_PEER_IP.key}" { it == null || it instanceof String }
} else {
"${SemanticAttributes.NET_PEER_IP.key}" { it == null || it == "127.0.0.1" || it == uri.host } // Optional
}
"${SemanticAttributes.NET_PEER_IP.key}" { it == null || it == "127.0.0.1" || it == uri.host } // Optional
if (httpClientAttributes.contains(SemanticAttributes.HTTP_URL)) {
"${SemanticAttributes.HTTP_URL.key}" { it == "${uri}" || it == "${removeFragment(uri)}" }
@ -927,11 +922,7 @@ abstract class HttpClientTest<REQUEST> extends InstrumentationSpecification {
"${SemanticAttributes.HTTP_METHOD.key}" method
}
if (httpClientAttributes.contains(SemanticAttributes.HTTP_FLAVOR)) {
if (uri.host == "www.google.com") {
"${SemanticAttributes.HTTP_FLAVOR.key}" { it == httpFlavor || it == "2.0" } // google https request can be http 2.0
} else {
"${SemanticAttributes.HTTP_FLAVOR.key}" httpFlavor
}
"${SemanticAttributes.HTTP_FLAVOR.key}" httpFlavor
}
if (httpClientAttributes.contains(SemanticAttributes.HTTP_USER_AGENT)) {
if (userAgent) {