From a79586bfba5d4acf70e493073f1dd66a177ce042 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ferreira?= Date: Tue, 13 Mar 2018 14:02:27 +0000 Subject: [PATCH 1/3] add support for DoubleSizeIdentifier --- src/main/scala/kamon/jaeger/JaegerReporter.scala | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/scala/kamon/jaeger/JaegerReporter.scala b/src/main/scala/kamon/jaeger/JaegerReporter.scala index 155bdded2..14daa188e 100644 --- a/src/main/scala/kamon/jaeger/JaegerReporter.scala +++ b/src/main/scala/kamon/jaeger/JaegerReporter.scala @@ -66,9 +66,10 @@ class JaegerClient(host: String, port: Int) { val from = Clock.toEpochMicros(span.from) val duration = Clock.toEpochMicros(span.to) - from + val (traceIdHigh, traceIdLow) = convertDoubleSizeIdentifier(span.context.traceID) val convertedSpan = new JaegerSpan( - convertIdentifier(span.context.traceID), - 0L, + traceIdLow, + traceIdHigh, convertIdentifier(span.context.spanID), convertIdentifier(span.context.parentID), span.operationName, @@ -115,4 +116,11 @@ class JaegerClient(host: String, port: Int) { // Assumes that Kamon was configured to use the default identity generator. ByteBuffer.wrap(identifier.bytes).getLong }.getOrElse(0L) + + private def convertDoubleSizeIdentifier(identifier: Identifier): (Long, Long) = Try { + val buffer = ByteBuffer.wrap(identifier.bytes) + (buffer.getLong, buffer.getLong) + }.getOrElse { + (0L, convertIdentifier(identifier)) + } } From fa371d78b9afd4dda182d7d4da2d770bed8c2899 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ferreira?= Date: Fri, 12 Apr 2019 16:52:04 +0100 Subject: [PATCH 2/3] fix compilation and scalafmt --- src/main/scala/kamon/jaeger/JaegerReporter.scala | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/scala/kamon/jaeger/JaegerReporter.scala b/src/main/scala/kamon/jaeger/JaegerReporter.scala index 3859022af..3a2e64ab5 100644 --- a/src/main/scala/kamon/jaeger/JaegerReporter.scala +++ b/src/main/scala/kamon/jaeger/JaegerReporter.scala @@ -92,9 +92,9 @@ class JaegerClient(host: String, val convertedSpan = new JaegerSpan( traceIdLow, traceIdHigh, - convertIdentifier(span.context.spanID), - convertIdentifier(span.context.parentID), - span.operationName, + convertIdentifier(context.spanID), + convertIdentifier(context.parentID), + kamonSpan.operationName, 0, from, duration @@ -137,8 +137,8 @@ class JaegerClient(host: String, // Assumes that Kamon was configured to use the default identity generator. ByteBuffer.wrap(identifier.bytes).getLong }.getOrElse(0L) - - private def convertDoubleSizeIdentifier(identifier: Identifier): (Long, Long) = + + private def convertDoubleSizeIdentifier(identifier: Identifier): (Long, Long) = Try { val buffer = ByteBuffer.wrap(identifier.bytes) (buffer.getLong, buffer.getLong) From 256c15a355bb659091ee8774f3db44e50f838efa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ferreira?= Date: Fri, 12 Apr 2019 16:58:30 +0100 Subject: [PATCH 3/3] update sbt and reformat files --- project/build.properties | 2 +- project/plugins.sbt | 3 +-- src/main/scala/kamon/jaeger/JaegerReporter.scala | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/project/build.properties b/project/build.properties index 133a8f197..c0bab0494 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.17 +sbt.version=1.2.8 diff --git a/project/plugins.sbt b/project/plugins.sbt index 8f8da10bc..2efacb9b6 100644 --- a/project/plugins.sbt +++ b/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"))) diff --git a/src/main/scala/kamon/jaeger/JaegerReporter.scala b/src/main/scala/kamon/jaeger/JaegerReporter.scala index 3a2e64ab5..600478180 100644 --- a/src/main/scala/kamon/jaeger/JaegerReporter.scala +++ b/src/main/scala/kamon/jaeger/JaegerReporter.scala @@ -138,7 +138,8 @@ class JaegerClient(host: String, ByteBuffer.wrap(identifier.bytes).getLong }.getOrElse(0L) - private def convertDoubleSizeIdentifier(identifier: Identifier): (Long, Long) = + private def convertDoubleSizeIdentifier( + identifier: Identifier): (Long, Long) = Try { val buffer = ByteBuffer.wrap(identifier.bytes) (buffer.getLong, buffer.getLong)