diff options
Diffstat (limited to 'kamon-spray')
-rw-r--r-- | kamon-spray/src/main/scala/kamon/spray/Spray.scala | 4 | ||||
-rw-r--r-- | kamon-spray/src/main/scala/spray/can/server/ServerRequestInstrumentation.scala | 19 | ||||
-rw-r--r-- | kamon-spray/src/test/scala/kamon/spray/SprayServerMetricsSpec.scala | 91 | ||||
-rw-r--r-- | kamon-spray/src/test/scala/kamon/spray/SprayServerTracingSpec.scala (renamed from kamon-spray/src/test/scala/kamon/spray/ServerRequestInstrumentationSpec.scala) | 33 |
4 files changed, 110 insertions, 37 deletions
diff --git a/kamon-spray/src/main/scala/kamon/spray/Spray.scala b/kamon-spray/src/main/scala/kamon/spray/Spray.scala index 9de1882a..76adb214 100644 --- a/kamon-spray/src/main/scala/kamon/spray/Spray.scala +++ b/kamon-spray/src/main/scala/kamon/spray/Spray.scala @@ -19,6 +19,8 @@ package kamon.spray import akka.actor.{ ExtendedActorSystem, ExtensionIdProvider, ExtensionId } import akka.actor import kamon.Kamon +import kamon.http.HttpServerMetrics +import kamon.metric.Metrics import spray.http.HttpRequest object Spray extends ExtensionId[SprayExtension] with ExtensionIdProvider { @@ -38,6 +40,8 @@ class SprayExtension(private val system: ExtendedActorSystem) extends Kamon.Exte val includeTraceToken: Boolean = config.getBoolean("automatic-trace-token-propagation") val traceTokenHeaderName: String = config.getString("trace-token-header-name") + val httpServerMetrics = Kamon(Metrics)(system).register(HttpServerMetrics, HttpServerMetrics.Factory).get + // It's safe to assume that HttpServerMetrics will always exist because there is no particular filter for it. val clientSegmentCollectionStrategy: ClientSegmentCollectionStrategy.Strategy = config.getString("client.segment-collection-strategy") match { diff --git a/kamon-spray/src/main/scala/spray/can/server/ServerRequestInstrumentation.scala b/kamon-spray/src/main/scala/spray/can/server/ServerRequestInstrumentation.scala index 85782e22..69b0160e 100644 --- a/kamon-spray/src/main/scala/spray/can/server/ServerRequestInstrumentation.scala +++ b/kamon-spray/src/main/scala/spray/can/server/ServerRequestInstrumentation.scala @@ -22,7 +22,7 @@ import spray.http.{ HttpResponse, HttpMessagePartWrapper, HttpRequest } import akka.event.Logging.Warning import scala.Some import kamon.Kamon -import kamon.spray.Spray +import kamon.spray.{ SprayExtension, Spray } import org.aspectj.lang.ProceedingJoinPoint import spray.http.HttpHeaders.RawHeader @@ -68,20 +68,21 @@ class ServerRequestInstrumentation { val storedContext = openRequest.traceContext verifyTraceContextConsistency(incomingContext, storedContext) - val proceedResult = incomingContext match { + incomingContext match { case None ⇒ pjp.proceed() case Some(traceContext) ⇒ val sprayExtension = Kamon(Spray)(traceContext.system) - if (sprayExtension.includeTraceToken) { + val proceedResult = if (sprayExtension.includeTraceToken) { val responseWithHeader = includeTraceTokenIfPossible(response, sprayExtension.traceTokenHeaderName, traceContext.token) pjp.proceed(Array(openRequest, responseWithHeader)) } else pjp.proceed - } - TraceRecorder.finish() - proceedResult + TraceRecorder.finish() + recordHttpServerMetrics(response, traceContext.name, sprayExtension) + proceedResult + } } def verifyTraceContextConsistency(incomingTraceContext: Option[TraceContext], storedTraceContext: Option[TraceContext]): Unit = { @@ -102,6 +103,12 @@ class ServerRequestInstrumentation { } + def recordHttpServerMetrics(response: HttpMessagePartWrapper, traceName: String, sprayExtension: SprayExtension): Unit = + response match { + case httpResponse: HttpResponse ⇒ sprayExtension.httpServerMetrics.recordResponse(traceName, httpResponse.status.intValue.toString) + case other ⇒ // Nothing to do then. + } + def includeTraceTokenIfPossible(response: HttpMessagePartWrapper, traceTokenHeaderName: String, token: String): HttpMessagePartWrapper = response match { case response: HttpResponse ⇒ response.withHeaders(response.headers ::: RawHeader(traceTokenHeaderName, token) :: Nil) diff --git a/kamon-spray/src/test/scala/kamon/spray/SprayServerMetricsSpec.scala b/kamon-spray/src/test/scala/kamon/spray/SprayServerMetricsSpec.scala new file mode 100644 index 00000000..c4b370d7 --- /dev/null +++ b/kamon-spray/src/test/scala/kamon/spray/SprayServerMetricsSpec.scala @@ -0,0 +1,91 @@ +package kamon.spray + +import akka.actor.ActorSystem +import akka.testkit.{ TestProbe, TestKitBase } +import com.typesafe.config.ConfigFactory +import kamon.Kamon +import kamon.http.HttpServerMetrics +import kamon.metric._ +import org.scalatest.concurrent.{ PatienceConfiguration, ScalaFutures } +import org.scalatest.{ Matchers, WordSpecLike } +import spray.http.{ StatusCodes, HttpResponse, HttpRequest } +import spray.httpx.RequestBuilding + +class SprayServerMetricsSpec extends TestKitBase with WordSpecLike with Matchers with RequestBuilding + with ScalaFutures with PatienceConfiguration with TestServer { + + val collectionContext = CollectionContext(100) + + implicit lazy val system: ActorSystem = ActorSystem("spray-server-metrics-spec", ConfigFactory.parseString( + """ + |akka { + | loglevel = ERROR + |} + | + |kamon { + | metrics { + | tick-interval = 1 hour + | + | filters = [ + | { + | trace { + | includes = [ "*" ] + | excludes = [] + | } + | } + | ] + | } + |} + """.stripMargin)) + + "the Spray Server metrics instrumentation" should { + "record trace metrics for requests received" in { + Kamon(Metrics)(system).register(TraceMetrics("GET: /record-trace-metrics"), TraceMetrics.Factory).get.collect(collectionContext) + val (connection, server) = buildClientConnectionAndServer + val client = TestProbe() + + for (repetition ← 1 to 10) { + client.send(connection, Get("/record-trace-metrics")) + server.expectMsgType[HttpRequest] + server.reply(HttpResponse(entity = "ok")) + client.expectMsgType[HttpResponse] + } + + for (repetition ← 1 to 5) { + client.send(connection, Get("/record-trace-metrics")) + server.expectMsgType[HttpRequest] + server.reply(HttpResponse(entity = "bad-request", status = StatusCodes.BadRequest)) + client.expectMsgType[HttpResponse] + } + + val snapshot = Kamon(Metrics)(system).register(TraceMetrics("GET: /record-trace-metrics"), TraceMetrics.Factory).get.collect(collectionContext) + snapshot.elapsedTime.numberOfMeasurements should be(15) + } + + "record http serve metrics for all the requests" in { + Kamon(Metrics)(system).register(HttpServerMetrics, HttpServerMetrics.Factory).get.collect(collectionContext) + val (connection, server) = buildClientConnectionAndServer + val client = TestProbe() + + for (repetition ← 1 to 10) { + client.send(connection, Get("/record-http-metrics")) + server.expectMsgType[HttpRequest] + server.reply(HttpResponse(entity = "ok")) + client.expectMsgType[HttpResponse] + } + + for (repetition ← 1 to 5) { + client.send(connection, Get("/record-http-metrics")) + server.expectMsgType[HttpRequest] + server.reply(HttpResponse(entity = "bad-request", status = StatusCodes.BadRequest)) + client.expectMsgType[HttpResponse] + } + + val snapshot = Kamon(Metrics)(system).register(HttpServerMetrics, HttpServerMetrics.Factory).get.collect(collectionContext) + snapshot.countsPerTraceAndStatusCode("GET: /record-http-metrics")("200").count should be(10) + snapshot.countsPerTraceAndStatusCode("GET: /record-http-metrics")("400").count should be(5) + snapshot.countsPerStatusCode("200").count should be(10) + snapshot.countsPerStatusCode("400").count should be(5) + } + } +} diff --git a/kamon-spray/src/test/scala/kamon/spray/ServerRequestInstrumentationSpec.scala b/kamon-spray/src/test/scala/kamon/spray/SprayServerTracingSpec.scala index ab9116fd..48253b1d 100644 --- a/kamon-spray/src/test/scala/kamon/spray/ServerRequestInstrumentationSpec.scala +++ b/kamon-spray/src/test/scala/kamon/spray/SprayServerTracingSpec.scala @@ -30,10 +30,10 @@ import com.typesafe.config.ConfigFactory import kamon.metric.TraceMetrics.ElapsedTime import kamon.metric.instrument.Histogram -class ServerRequestInstrumentationSpec extends TestKitBase with WordSpecLike with Matchers with RequestBuilding +class SprayServerTracingSpec extends TestKitBase with WordSpecLike with Matchers with RequestBuilding with ScalaFutures with PatienceConfiguration with TestServer { - implicit lazy val system: ActorSystem = ActorSystem("client-pipelining-segment-strategy-instrumentation-spec", ConfigFactory.parseString( + implicit lazy val system: ActorSystem = ActorSystem("spray-server-tracing-spec", ConfigFactory.parseString( """ |akka { | loglevel = ERROR @@ -52,12 +52,6 @@ class ServerRequestInstrumentationSpec extends TestKitBase with WordSpecLike wit | } | ] | } - | - | spray { - | client { - | segment-collection-strategy = internal - | } - | } |} """.stripMargin)) @@ -104,29 +98,6 @@ class ServerRequestInstrumentationSpec extends TestKitBase with WordSpecLike wit response.headers should not contain (RawHeader(Kamon(Spray).traceTokenHeaderName, "propagation-disabled")) } - - "open and finish a trace during the lifetime of a request" in { - val (connection, server) = buildClientConnectionAndServer - val client = TestProbe() - - val metricListener = TestProbe() - Kamon(Metrics)(system).subscribe(TraceMetrics, "*", metricListener.ref, permanently = true) - metricListener.expectMsgType[TickMetricSnapshot] - - client.send(connection, Get("/open-and-finish")) - server.expectMsgType[HttpRequest] - server.reply(HttpResponse(entity = "ok")) - client.expectMsgType[HttpResponse] - - val tickSnapshot = metricListener.expectMsgType[TickMetricSnapshot] - val traceMetrics = tickSnapshot.metrics.find { case (k, v) ⇒ k.name.contains("open-and-finish") } map (_._2.metrics) - traceMetrics should not be empty - - traceMetrics map { metrics ⇒ - metrics(ElapsedTime).asInstanceOf[Histogram.Snapshot].numberOfMeasurements should be(1L) - } - } - } def enableAutomaticTraceTokenPropagation(): Unit = setIncludeTraceToken(true) |