From b80e4bd135ed50b01def5a4c2f7c42983efb54fd Mon Sep 17 00:00:00 2001 From: Ivan Topolnjak Date: Thu, 28 Nov 2013 09:51:51 -0300 Subject: initial adjustments to allow recording trace segments --- .../src/main/scala/kamon/trace/Segments.scala | 30 ++++++++++++++++++++++ kamon-trace/src/main/scala/kamon/trace/Trace.scala | 8 ++++++ .../src/main/scala/kamon/trace/TraceContext.scala | 2 +- .../src/main/scala/kamon/trace/UowTracing.scala | 1 + 4 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 kamon-trace/src/main/scala/kamon/trace/Segments.scala (limited to 'kamon-trace/src/main/scala') diff --git a/kamon-trace/src/main/scala/kamon/trace/Segments.scala b/kamon-trace/src/main/scala/kamon/trace/Segments.scala new file mode 100644 index 00000000..0e1778bf --- /dev/null +++ b/kamon-trace/src/main/scala/kamon/trace/Segments.scala @@ -0,0 +1,30 @@ +/* =================================================== + * Copyright © 2013 the kamon project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================================================== */ + +package kamon.trace + +object Segments { + + trait Category + case object HttpClientRequest extends Category + + case class Start(category: Category, description: String = "", + attributes: Map[String, String] = Map(), timestamp: Long = System.nanoTime()) + + case class End(attributes: Map[String, String] = Map(), timestamp: Long = System.nanoTime()) + + case class Segment(start: Start, end: End) +} diff --git a/kamon-trace/src/main/scala/kamon/trace/Trace.scala b/kamon-trace/src/main/scala/kamon/trace/Trace.scala index 05519067..02947dd6 100644 --- a/kamon-trace/src/main/scala/kamon/trace/Trace.scala +++ b/kamon-trace/src/main/scala/kamon/trace/Trace.scala @@ -60,6 +60,14 @@ object Trace extends ExtensionId[TraceExtension] with ExtensionIdProvider { // TODO: FIX def newTraceContext(name: String)(implicit system: ActorSystem): TraceContext = TraceContext(Kamon(Trace), tranid.getAndIncrement, name) + + def startSegment(start: Segments.Start): SegmentCompletionHandle = SegmentCompletionHandle(start) + + case class SegmentCompletionHandle(start: Segments.Start) { + def complete(end: Segments.End): Unit = { + println(s"Completing the Segment: $start - $end") + } + } } class TraceExtension(system: ExtendedActorSystem) extends Kamon.Extension { diff --git a/kamon-trace/src/main/scala/kamon/trace/TraceContext.scala b/kamon-trace/src/main/scala/kamon/trace/TraceContext.scala index eee3e0b0..3698cea1 100644 --- a/kamon-trace/src/main/scala/kamon/trace/TraceContext.scala +++ b/kamon-trace/src/main/scala/kamon/trace/TraceContext.scala @@ -23,7 +23,7 @@ import kamon.Kamon import kamon.trace.UowTracing.{ Finish, Start } // TODO: Decide if we need or not an ID, generating it takes time and it doesn't seem necessary. -protected[kamon] case class TraceContext(private val collector: ActorRef, id: Long, uow: String = "", userContext: Option[Any] = None) { +case class TraceContext(private val collector: ActorRef, id: Long, uow: String = "", userContext: Option[Any] = None) { def start(name: String) = collector ! Start(id, name) diff --git a/kamon-trace/src/main/scala/kamon/trace/UowTracing.scala b/kamon-trace/src/main/scala/kamon/trace/UowTracing.scala index 3d1a7778..7026569c 100644 --- a/kamon-trace/src/main/scala/kamon/trace/UowTracing.scala +++ b/kamon-trace/src/main/scala/kamon/trace/UowTracing.scala @@ -19,6 +19,7 @@ import akka.actor._ import scala.concurrent.duration.Duration import kamon.trace.UowTracing._ + sealed trait UowSegment { def id: Long def timestamp: Long -- cgit v1.2.3