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

Review fixes

This commit is contained in:
Tyler Benson 2019-02-05 11:58:36 -08:00
parent bbcd2f6949
commit 12e7efc0b9
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dd-java-agent/instrumentation/akka-http-10.0/src/main/scala/datadog/trace/instrumentation/akkahttp/AkkaHttpClientTransformFlow.scala
View File

@ -30,7 +30,9 @@ object AkkaHttpClientTransformFlow {
.withTag(Tags.COMPONENT.getKey, "akka-http-client") .withTag(Tags.COMPONENT.getKey, "akka-http-client")
.withTag(Tags.HTTP_URL.getKey, request.getUri.toString) .withTag(Tags.HTTP_URL.getKey, request.getUri.toString)
.start() .start()
if (Config.get.isHttpClientSplitByDomain) span.setTag(DDTags.SERVICE_NAME, request.getUri.host.address) if (Config.get.isHttpClientSplitByDomain) {
span.setTag(DDTags.SERVICE_NAME, request.getUri.host.address)
}
val headers = new AkkaHttpClientInstrumentation.AkkaHttpHeaders(request) val headers = new AkkaHttpClientInstrumentation.AkkaHttpHeaders(request)
GlobalTracer.get.inject(span.context, Format.Builtin.HTTP_HEADERS, headers) GlobalTracer.get.inject(span.context, Format.Builtin.HTTP_HEADERS, headers)
(headers.getRequest, data) (headers.getRequest, data)

27
dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy
View File

@ -102,11 +102,9 @@ class AkkaHttpClientInstrumentationTest extends AgentTestRunner {
} }
where: where:
route | expectedStatus | expectedError | expectedMessage route | expectedStatus | expectedError | expectedMessage | renameService
"success" | 200 | false | MESSAGE "success" | 200 | false | MESSAGE | true
"error" | 500 | true | null "error" | 500 | true | null | false
renameService = true
} }
def "error request trace"() { def "error request trace"() {
@ -190,14 +188,13 @@ class AkkaHttpClientInstrumentationTest extends AgentTestRunner {
setup: setup:
def url = server.address.resolve("/" + route).toURL() def url = server.address.resolve("/" + route).toURL()
CompletionStage<Pair<Try<HttpResponse>, Integer>> sink = Source
.<Pair<HttpRequest, Integer>> single(new Pair(HttpRequest.create(url.toString()), 1))
.via(pool)
.runWith(Sink.<Pair<Try<HttpResponse>, Integer>> head(), materializer)
when: when:
HttpResponse response = withConfigOverride("dd.$Config.HTTP_CLIENT_HOST_SPLIT_BY_DOMAIN", "$renameService") { HttpResponse response = withConfigOverride("dd.$Config.HTTP_CLIENT_HOST_SPLIT_BY_DOMAIN", "$renameService") {
sink.toCompletableFuture().get().first().get() Source
.<Pair<HttpRequest, Integer>> single(new Pair(HttpRequest.create(url.toString()), 1))
.via(pool)
.runWith(Sink.<Pair<Try<HttpResponse>, Integer>> head(), materializer)
.toCompletableFuture().get().first().get()
} }
String message = readMessage(response) String message = readMessage(response)
@ -236,11 +233,9 @@ class AkkaHttpClientInstrumentationTest extends AgentTestRunner {
} }
where: where:
route | expectedStatus | expectedError | expectedMessage route | expectedStatus | expectedError | expectedMessage | renameService
"success" | 200 | false | MESSAGE "success" | 200 | false | MESSAGE | true
"error" | 500 | true | null "error" | 500 | true | null | false
renameService = true
} }
def "error request pool trace"() { def "error request pool trace"() {