diff options
| author | Diego <diegolparra@gmail.com> | 2015-08-22 19:28:19 -0300 |
|---|---|---|
| committer | Diego <diegolparra@gmail.com> | 2015-08-22 19:28:19 -0300 |
| commit | 7f96f925670f1b8578e20b2bb171eac1cf2dfbfe (patch) | |
| tree | 471fd5efada5fc3de7e7934f62f2c232c9ba90f7 | |
| parent | 1577aa9addb6c79d01f7261915b9e33b0c01fcd9 (diff) | |
| download | Kamon-7f96f925670f1b8578e20b2bb171eac1cf2dfbfe.tar.gz Kamon-7f96f925670f1b8578e20b2bb171eac1cf2dfbfe.tar.bz2 Kamon-7f96f925670f1b8578e20b2bb171eac1cf2dfbfe.zip | |
= play: use uri.getAuthority forn generateHttpClientSegmentName
3 files changed, 3 insertions, 3 deletions
diff --git a/kamon-play-2.3.x/src/test/scala/kamon/play/LoggerLikeInstrumentationSpec.scala b/kamon-play-2.3.x/src/test/scala/kamon/play/LoggerLikeInstrumentationSpec.scala index cb6a9828..84a77de7 100644 --- a/kamon-play-2.3.x/src/test/scala/kamon/play/LoggerLikeInstrumentationSpec.scala +++ b/kamon-play-2.3.x/src/test/scala/kamon/play/LoggerLikeInstrumentationSpec.scala @@ -72,7 +72,7 @@ class LoggerLikeInstrumentationSpec extends PlaySpec with OneServerPerSuite with "allow retrieve a value from the MDC when was created a key of type AvailableToMdc in the current request" in { LoggingHandler.appenderStart() - Await.result(route(FakeRequest(GET, "/logging")).get, 500 millis) + Await.result(route(FakeRequest(GET, "/logging")).get, 1 second) TraceLocal.retrieve(TraceLocalHeaderKey) must be(Some(headerValue)) TraceLocal.retrieve(TraceLocalOtherKey) must be(Some(otherValue)) diff --git a/kamon-play-2.4.x/src/main/scala/kamon/play/Play.scala b/kamon-play-2.4.x/src/main/scala/kamon/play/Play.scala index 53a5b80a..c8177610 100644 --- a/kamon-play-2.4.x/src/main/scala/kamon/play/Play.scala +++ b/kamon-play-2.4.x/src/main/scala/kamon/play/Play.scala @@ -77,5 +77,5 @@ class DefaultNameGenerator extends NameGenerator { }) } getOrElse "UntaggedTrace" - def generateHttpClientSegmentName(request: WSRequest): String = request.url + def generateHttpClientSegmentName(request: WSRequest): String = request.uri.getAuthority } diff --git a/kamon-play-2.4.x/src/test/scala/kamon/play/LoggerLikeInstrumentationSpec.scala b/kamon-play-2.4.x/src/test/scala/kamon/play/LoggerLikeInstrumentationSpec.scala index 6085d046..920b553e 100644 --- a/kamon-play-2.4.x/src/test/scala/kamon/play/LoggerLikeInstrumentationSpec.scala +++ b/kamon-play-2.4.x/src/test/scala/kamon/play/LoggerLikeInstrumentationSpec.scala @@ -70,7 +70,7 @@ class LoggerLikeInstrumentationSpec extends PlaySpec with OneServerPerSuite with "allow retrieve a value from the MDC when was created a key of type AvailableToMdc in the current request" in { LoggingHandler.appenderStart() - Await.result(route(FakeRequest(GET, "/logging")).get, 500 millis) + Await.result(route(FakeRequest(GET, "/logging")).get, 1 second) TraceLocal.retrieve(TraceLocalHeaderKey) must be(Some(headerValue)) TraceLocal.retrieve(TraceLocalOtherKey) must be(Some(otherValue)) |