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

Explicitly check for key for attribute assertions using hasEntrySatis… (#3703) 

* Explicitly check for key for attribute assertions using hasEntrySatisfying

* Check test user agent set first
This commit is contained in:
Anuraag Agrawal 2021-07-28 19:05:00 +09:00 committed by GitHub
parent 4617a0475a
commit e4fcbb8f51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java
View File

@ -997,6 +997,10 @@ public abstract class AbstractHttpClientTest<REQUEST> {
if (httpClientAttributes.contains(SemanticAttributes.HTTP_USER_AGENT)) {
String userAgent = userAgent();
if (userAgent != null) {
// TODO(anuraaga): Remove after updating to SDK 1.5.0 which adds this into
// hasEntrySatisfying.
// https://github.com/open-telemetry/opentelemetry-java/pull/3433
assertThat(attrs.asMap()).containsKey(SemanticAttributes.HTTP_USER_AGENT);
assertThat(attrs)
.hasEntrySatisfying(
SemanticAttributes.HTTP_USER_AGENT,
@ -1004,6 +1008,10 @@ public abstract class AbstractHttpClientTest<REQUEST> {
}
}
if (httpClientAttributes.contains(SemanticAttributes.HTTP_HOST)) {
// TODO(anuraaga): Remove after updating to SDK 1.5.0 which adds this into
// hasEntrySatisfying.
// https://github.com/open-telemetry/opentelemetry-java/pull/3433
assertThat(attrs.asMap()).containsKey(SemanticAttributes.HTTP_HOST);
// TODO(anuraaga): It's not well defined when instrumentation records with and
// without port. We should make this more uniform
assertThat(attrs)
@ -1012,12 +1020,22 @@ public abstract class AbstractHttpClientTest<REQUEST> {
host -> assertThat(host).startsWith(uri.getHost()));
}
if (httpClientAttributes.contains(SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH)) {
// TODO(anuraaga): Remove after updating to SDK 1.5.0 which adds this into
// hasEntrySatisfying.
// https://github.com/open-telemetry/opentelemetry-java/pull/3433
assertThat(attrs.asMap())
.containsKey(SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH);
assertThat(attrs)
.hasEntrySatisfying(
SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH,
length -> assertThat(length).isNotNegative());
}
if (httpClientAttributes.contains(SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH)) {
// TODO(anuraaga): Remove after updating to SDK 1.5.0 which adds this into
// hasEntrySatisfying.
// https://github.com/open-telemetry/opentelemetry-java/pull/3433
assertThat(attrs.asMap())
.containsKey(SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH);
assertThat(attrs)
.hasEntrySatisfying(
SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH,