From 194bc4fc90c53199eae6b6ca05964f7aa03bbdb3 Mon Sep 17 00:00:00 2001
From: Ivan Topolnjak <ivantopo@gmail.com>
Date: Sat, 26 Aug 2017 21:56:50 +0200
Subject: remove the annotations API from the Span

---
 .../src/test/scala/kamon/trace/LocalSpanSpec.scala | 21 ------------------
 kamon-core/src/main/scala/kamon/trace/Span.scala   | 25 ++--------------------
 2 files changed, 2 insertions(+), 44 deletions(-)

diff --git a/kamon-core-tests/src/test/scala/kamon/trace/LocalSpanSpec.scala b/kamon-core-tests/src/test/scala/kamon/trace/LocalSpanSpec.scala
index 6da7829d..f6bd3517 100644
--- a/kamon-core-tests/src/test/scala/kamon/trace/LocalSpanSpec.scala
+++ b/kamon-core-tests/src/test/scala/kamon/trace/LocalSpanSpec.scala
@@ -56,10 +56,6 @@ class LocalSpanSpec extends WordSpec with Matchers with BeforeAndAfterAll with E
           .addSpanTag("span-boolean-tag-true", true)
           .addSpanTag("span-boolean-tag-false", false)
           .addSpanTag("span-number-tag", 42)
-          .annotate("simple-annotation")
-          .annotate("regular-annotation", Map("data" -> "something"))
-          .annotate(4200, "custom-annotation-1", Map("custom" -> "yes-1"))
-          .annotate(Annotation(4201, "custom-annotation-2", Map("custom" -> "yes-2")))
           .setOperationName("fully-populated-span")
           .finish(200)
 
@@ -78,23 +74,6 @@ class LocalSpanSpec extends WordSpec with Matchers with BeforeAndAfterAll with E
             "span-boolean-tag-false" -> TagValue.False,
             "span-number-tag" -> TagValue.Number(42)
           )
-
-          finishedSpan.annotations.length shouldBe (4)
-          val annotations = finishedSpan.annotations.groupBy(_.name)
-          annotations.keys should contain allOf(
-            "simple-annotation",
-            "regular-annotation",
-            "custom-annotation-1",
-            "custom-annotation-2"
-          )
-
-          val customAnnotationOne = annotations("custom-annotation-1").head
-          customAnnotationOne.timestampMicros shouldBe (4200)
-          customAnnotationOne.fields shouldBe (Map("custom" -> "yes-1"))
-
-          val customAnnotationTwo = annotations("custom-annotation-2").head
-          customAnnotationTwo.timestampMicros shouldBe (4201)
-          customAnnotationTwo.fields shouldBe (Map("custom" -> "yes-2"))
         }
       }
     }
diff --git a/kamon-core/src/main/scala/kamon/trace/Span.scala b/kamon-core/src/main/scala/kamon/trace/Span.scala
index 3158aa73..c359f8e0 100644
--- a/kamon-core/src/main/scala/kamon/trace/Span.scala
+++ b/kamon-core/src/main/scala/kamon/trace/Span.scala
@@ -33,8 +33,6 @@ trait Span {
 
   def context(): SpanContext
 
-  def annotate(annotation: Span.Annotation): Span
-
   def addTag(key: String, value: String): Span
 
   def addSpanTag(key: String, value: String): Span
@@ -54,15 +52,6 @@ trait Span {
   def finish(): Unit =
     finish(Clock.microTimestamp())
 
-  def annotate(name: String): Span =
-    annotate(Span.Annotation(Clock.microTimestamp(), name, Map.empty))
-
-  def annotate(name: String, fields: Map[String, String]): Span =
-    annotate(Span.Annotation(Clock.microTimestamp(), name, fields))
-
-  def annotate(timestampMicroseconds: Long, name: String, fields: Map[String, String]): Span =
-    annotate(Span.Annotation(timestampMicroseconds, name, fields))
-
 }
 
 object Span {
@@ -73,7 +62,6 @@ object Span {
     override val context: SpanContext = SpanContext.EmptySpanContext
     override def isEmpty(): Boolean = true
     override def isLocal(): Boolean = true
-    override def annotate(annotation: Annotation): Span = this
     override def addTag(key: String, value: String): Span = this
     override def addSpanTag(key: String, value: String): Span = this
     override def addSpanTag(key: String, value: Long): Span = this
@@ -102,17 +90,10 @@ object Span {
 
     private var spanTags: Map[String, Span.TagValue] = initialSpanTags
     private var customMetricTags = initialMetricTags
-    private var annotations = List.empty[Span.Annotation]
 
     override def isEmpty(): Boolean = false
     override def isLocal(): Boolean = true
 
-    def annotate(annotation: Annotation): Span = synchronized {
-      if(sampled && open)
-        annotations = annotation :: annotations
-      this
-    }
-
     override def addTag(key: String, value: String): Span = synchronized {
       addSpanTag(key, value)
       addMetricTag(key, value)
@@ -172,7 +153,7 @@ object Span {
     }
 
     private def toFinishedSpan(endTimestampMicros: Long): Span.FinishedSpan =
-      Span.FinishedSpan(spanContext, operationName, startTimestampMicros, endTimestampMicros, spanTags, annotations)
+      Span.FinishedSpan(spanContext, operationName, startTimestampMicros, endTimestampMicros, spanTags)
 
     private def recordSpanMetrics(endTimestampMicros: Long): Unit = {
       val elapsedTime = endTimestampMicros - startTimestampMicros
@@ -204,7 +185,6 @@ object Span {
   final class Remote(val context: SpanContext) extends Span {
     override def isEmpty(): Boolean = false
     override def isLocal(): Boolean = false
-    override def annotate(annotation: Annotation): Span = this
     override def addTag(key: String, value: String): Span = this
     override def addSpanTag(key: String, value: String): Span = this
     override def addSpanTag(key: String, value: Long): Span = this
@@ -251,7 +231,6 @@ object Span {
     operationName: String,
     startTimestampMicros: Long,
     endTimestampMicros: Long,
-    tags: Map[String, Span.TagValue],
-    annotations: Seq[Annotation]
+    tags: Map[String, Span.TagValue]
   )
 }
\ No newline at end of file
-- 
cgit v1.2.3