From 63f99d1f5cc7850fc7c559385b85fa1828d7cd79 Mon Sep 17 00:00:00 2001 From: Ivan Topolnjak Date: Wed, 23 Jul 2014 15:08:59 -0300 Subject: + core,spray: create and implement http server metrics for spray, related to #56 --- kamon-core/src/main/scala/kamon/metric/TraceMetrics.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kamon-core/src/main/scala/kamon/metric/TraceMetrics.scala') diff --git a/kamon-core/src/main/scala/kamon/metric/TraceMetrics.scala b/kamon-core/src/main/scala/kamon/metric/TraceMetrics.scala index 1ee1eab4..187eb07d 100644 --- a/kamon-core/src/main/scala/kamon/metric/TraceMetrics.scala +++ b/kamon-core/src/main/scala/kamon/metric/TraceMetrics.scala @@ -54,7 +54,7 @@ object TraceMetrics extends MetricGroupCategory { type GroupSnapshotType = TraceMetricsSnapshot def merge(that: TraceMetricsSnapshot, context: CollectionContext): TraceMetricsSnapshot = - TraceMetricsSnapshot(elapsedTime.merge(that.elapsedTime, context), Map.empty) + TraceMetricsSnapshot(elapsedTime.merge(that.elapsedTime, context), Map.empty) // TODO: Merge the segments metrics correctly and test it! def metrics: Map[MetricIdentity, MetricSnapshot] = segments + (ElapsedTime -> elapsedTime) } -- cgit v1.2.3