diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2014-07-23 15:08:59 -0300 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2014-07-23 15:08:59 -0300 |
| commit | 860c568db90699ea58ef13c5a5cdc08ccc3dbb07 (patch) | |
| tree | bc7f07a6271c46ec84e784a6ee90302d3671e110 /kamon-core/src/main/scala/kamon/metric/TraceMetrics.scala | |
| parent | a0157772ad132ca449a9f5dfe6a2242af21b0c31 (diff) | |
| download | Kamon-860c568db90699ea58ef13c5a5cdc08ccc3dbb07.tar.gz Kamon-860c568db90699ea58ef13c5a5cdc08ccc3dbb07.tar.bz2 Kamon-860c568db90699ea58ef13c5a5cdc08ccc3dbb07.zip | |
+ core,spray: create and implement http server metrics for spray, related to #56
Diffstat (limited to 'kamon-core/src/main/scala/kamon/metric/TraceMetrics.scala')
| -rw-r--r-- | kamon-core/src/main/scala/kamon/metric/TraceMetrics.scala | 2 |
1 files changed, 1 insertions, 1 deletions
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) } |