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

AWS 1.11 strict context check (#4366)

This commit is contained in:
Lauri Tulmin 2021-10-15 22:31:37 +03:00 committed by GitHub
parent 699a5adb00
commit 745637cadd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
instrumentation/aws-sdk/aws-sdk-1.11/javaagent-unit-tests/build.gradle.kts
View File

@ -11,7 +11,3 @@ dependencies {
testImplementation("org.assertj:assertj-core")
}
tasks.withType<Test>().configureEach {
jvmArgs("-Dio.opentelemetry.context.enableStrictContext=false")
}

11
instrumentation/aws-sdk/aws-sdk-1.11/javaagent-unit-tests/src/test/java/TracingRequestHandlerTest.java
View File

@ -25,7 +25,13 @@ class TracingRequestHandlerTest {
}
private static Request<SendMessageRequest> request() {
Request<SendMessageRequest> request = new DefaultRequest<>(new SendMessageRequest(), "test");
// Using a subclass of SendMessageRequest because for SendMessageRequest instrumentation
// creates PRODUCER span, for others CLIENT span. We need to use CLIENT spans for
// runWithClientSpan in shouldNotSetScopeAndNotFailIfClientSpanAlreadyPresent to work.
class CustomSendMessageRequest extends SendMessageRequest {}
Request<SendMessageRequest> request =
new DefaultRequest<>(new CustomSendMessageRequest(), "test");
request.setEndpoint(URI.create("http://test.uri"));
return request;
}
@ -61,5 +67,8 @@ class TracingRequestHandlerTest {
// then - no exception and scope not set
assertThat(request.getHandlerContext(TracingRequestHandler.SCOPE)).isNotNull();
underTest.afterResponse(request, response(request));
// cleanup
underTest.afterError(request, null, null);
}
}