Merge pull request #10 from sjoerdmulder/bugfix/9

Fix for issue #9

.travis.yml

@@ -1,8 +1,8 @@
 language: scala
 script:
-  - sbt publishLocal
+  - sbt test publishLocal
 scala:
-   - 2.12.6
+   - 2.12.8
 jdk:
    - oraclejdk8
 before_script:

build.sbt

@@ -1,8 +1,8 @@
-scalaVersion := "2.12.6"
+scalaVersion := "2.12.8"
 resolvers += Resolver.mavenLocal
 resolvers += Resolver.bintrayRepo("kamon-io", "snapshots")
 
-libraryDependencies += "io.kamon" %% "kamon-core" % "1.1.3"
-libraryDependencies += "io.zipkin.reporter2" % "zipkin-reporter" % "2.7.7"
-libraryDependencies += "io.zipkin.reporter2" % "zipkin-sender-okhttp3" % "2.7.7"
+libraryDependencies += "io.kamon" %% "kamon-core" % "1.1.5"
+libraryDependencies += "io.zipkin.reporter2" % "zipkin-reporter" % "2.7.14"
+libraryDependencies += "io.zipkin.reporter2" % "zipkin-sender-okhttp3" % "2.7.14"
 libraryDependencies += scalatest % "test"

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.17
+sbt.version=1.2.6

project/plugins.sbt

@@ -1,2 +1 @@
-lazy val root: Project = project.in(file(".")).dependsOn(latestSbtUmbrella)
-lazy val latestSbtUmbrella = uri("git://github.com/kamon-io/kamon-sbt-umbrella.git")
+lazy val root: Project = project in file(".") dependsOn(RootProject(uri("git://github.com/kamon-io/kamon-sbt-umbrella.git")))

src/main/scala/kamon/zipkin/Zipkin.scala

@@ -19,6 +19,7 @@ package kamon.zipkin
 import java.net.InetAddress
 
 import com.typesafe.config.Config
+import kamon.trace.IdentityProvider
 import kamon.{Kamon, SpanReporter}
 import kamon.trace.Span.{Mark, TagValue, FinishedSpan => KamonSpan}
 import kamon.util.Clock
@@ -51,11 +52,13 @@ class ZipkinReporter extends SpanReporter {
   private[zipkin] def convertSpan(kamonSpan: KamonSpan): ZipkinSpan = {
     val context = kamonSpan.context
     val duration = Math.floorDiv(Clock.nanosBetween(kamonSpan.from, kamonSpan.to), 1000)
+    // Zipkin uses null to identify no identifier
+    val parentId: String = if (context.parentID.equals(IdentityProvider.NoIdentifier)) null else context.parentID.string
     val builder = ZipkinSpan.newBuilder()
       .localEndpoint(localEndpoint)
       .traceId(context.traceID.string)
       .id(context.spanID.string)
-      .parentId(context.parentID.string)
+      .parentId(parentId)
       .name(kamonSpan.operationName)
       .timestamp(Clock.toEpochMicros(kamonSpan.from))
       .duration(duration)

src/test/scala/kamon/zipkin/SpanConversionSpec.scala

@@ -4,7 +4,7 @@ import java.time.Instant
 
 import kamon.trace.IdentityProvider.Identifier
 import kamon.trace.SpanContext.SamplingDecision
-import kamon.trace.{Span, SpanContext}
+import kamon.trace.{IdentityProvider, Span, SpanContext}
 import kamon.util.Clock
 import zipkin2.{Endpoint, Span => ZipkinSpan}
 import org.scalatest.{Matchers, WordSpec}
@@ -23,6 +23,17 @@ class SpanConversionSpec extends WordSpec with Matchers {
       zipkinSpan.timestamp() shouldBe Clock.toEpochMicros(kamonSpan.from)
     }
 
+    "convert span without parent" in {
+      val kamonSpan = newSpan().build()
+      val zipkinSpan = convert(kamonSpan.copy(context =
+        kamonSpan.context.copy(parentID = IdentityProvider.NoIdentifier)
+      ))
+
+      zipkinSpan.traceId() shouldBe kamonSpan.context.traceID.string
+      zipkinSpan.id() shouldBe kamonSpan.context.spanID.string
+      zipkinSpan.parentId() shouldBe null
+    }
+
     "assign a Span kind for client and server operations" in {
       val noKindSpan = newSpan().build()