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 test latest deps (#6429)

This commit is contained in:
Trask Stalnaker 2022-08-06 00:02:16 -07:00 committed by GitHub
parent b2c90c79b5
commit f46ca5dfe0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/S3TracingTest.groovy
View File

@ -64,6 +64,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"net.peer.name" String
"net.transport" IP_TCP
"net.peer.port" { it == null || Number }
"$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long }
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long }
}
}
@ -88,6 +89,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"net.peer.name" String
"net.transport" IP_TCP
"net.peer.port" { it == null || Number }
"$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long }
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long }
}
}
@ -112,6 +114,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"net.peer.name" String
"net.transport" IP_TCP
"net.peer.port" { it == null || Number }
"$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long }
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long }
}
}
@ -136,6 +139,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"net.peer.name" String
"net.transport" IP_TCP
"net.peer.port" { it == null || Number }
"$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long }
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long }
}
}
@ -160,6 +164,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"net.peer.name" String
"net.transport" IP_TCP
"net.peer.port" { it == null || Number }
"$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long }
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long }
}
}
@ -183,6 +188,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"net.peer.name" String
"net.transport" IP_TCP
"net.peer.port" { it == null || Number }
"$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long }
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long }
}
}
@ -206,6 +212,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"net.peer.name" String
"net.transport" IP_TCP
"net.peer.port" { it == null || Number }
"$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long }
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long }
}
}
@ -228,6 +235,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"net.peer.name" String
"net.transport" IP_TCP
"net.peer.port" { it == null || Number }
"$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long }
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long }
}
}
@ -256,6 +264,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"net.peer.name" String
"net.transport" IP_TCP
"net.peer.port" { it == null || Number }
"$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long }
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long }
}
}
@ -279,6 +288,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"net.peer.name" String
"net.transport" IP_TCP
"net.peer.port" { it == null || Number }
"$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long }
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long }
}
}
@ -302,6 +312,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"net.peer.name" String
"net.transport" IP_TCP
"net.peer.port" { it == null || Number }
"$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long }
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long }
}
}
@ -325,6 +336,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"net.peer.name" String
"net.transport" IP_TCP
"net.peer.port" { it == null || Number }
"$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long }
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long }
}
}
@ -348,6 +360,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"net.peer.name" String
"net.transport" IP_TCP
"net.peer.port" { it == null || Number }
"$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long }
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long }
}
}
@ -401,6 +414,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"net.peer.name" String
"net.transport" IP_TCP
"net.peer.port" { it == null || Number }
"$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long }
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long }
}
}
@ -424,6 +438,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"net.peer.name" String
"net.transport" IP_TCP
"net.peer.port" { it == null || Number }
"$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long }
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long }
}
}
@ -447,6 +462,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"net.peer.name" String
"net.transport" IP_TCP
"net.peer.port" { it == null || Number }
"$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long }
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long }
}
}
@ -469,6 +485,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"net.peer.name" String
"net.transport" IP_TCP
"net.peer.port" { it == null || Number }
"$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long }
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long }
}
}
@ -491,6 +508,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"net.peer.name" String
"net.transport" IP_TCP
"net.peer.port" { it == null || Number }
"$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long }
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long }
}
}
@ -514,6 +532,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"net.peer.name" String
"net.transport" IP_TCP
"net.peer.port" { it == null || Number }
"$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long }
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long }
}
}
@ -536,6 +555,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"net.peer.name" String
"net.transport" IP_TCP
"net.peer.port" { it == null || Number }
"$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long }
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long }
}
}
@ -559,6 +579,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"net.peer.name" String
"net.transport" IP_TCP
"net.peer.port" { it == null || Number }
"$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long }
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long }
}
}
@ -583,6 +604,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"net.peer.name" String
"net.transport" IP_TCP
"net.peer.port" { it == null || Number }
"$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long }
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long }
}
}
@ -606,6 +628,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"net.peer.name" String
"net.transport" IP_TCP
"net.peer.port" { it == null || Number }
"$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long }
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long }
}
}
@ -633,6 +656,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"net.peer.name" String
"net.transport" IP_TCP
"net.peer.port" { it == null || Number }
"$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long }
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long }
}
}
@ -657,6 +681,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"net.peer.name" String
"net.transport" IP_TCP
"net.peer.port" { it == null || Number }
"$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long }
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long }
}
}
@ -680,6 +705,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"net.peer.name" String
"net.transport" IP_TCP
"net.peer.port" { it == null || Number }
"$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long }
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long }
}
}
@ -703,6 +729,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"net.peer.name" String
"net.transport" IP_TCP
"net.peer.port" { it == null || Number }
"$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long }
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long }
}
}
@ -726,6 +753,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"net.peer.name" String
"net.transport" IP_TCP
"net.peer.port" { it == null || Number }
"$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long }
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long }
}
}
@ -749,6 +777,7 @@ class S3TracingTest extends AgentInstrumentationSpecification {
"net.peer.name" String
"net.transport" IP_TCP
"net.peer.port" { it == null || Number }
"$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long }
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" { it == null || it instanceof Long }
}
}

1
instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/groovy/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractAws1ClientTest.groovy
View File

@ -108,6 +108,7 @@ abstract class AbstractAws1ClientTest extends InstrumentationSpecification {
"$SemanticAttributes.HTTP_METHOD" "$method"
"$SemanticAttributes.HTTP_STATUS_CODE" 200
"$SemanticAttributes.HTTP_FLAVOR" "1.1"
"$SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH" { it == null || it instanceof Long }
"$SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH" Long
"$SemanticAttributes.NET_PEER_PORT" server.httpPort()
"$SemanticAttributes.NET_PEER_NAME" "127.0.0.1"