Merge branch 'master' into moar_moar

hughsimpson · Nov 7, 2023 · 1af340c · 1af340c
2 parents 3841232 + ffb77be
commit 1af340c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 0 deletions.
diff --git a/build.sbt b/build.sbt
@@ -499,6 +499,7 @@ lazy val `kamon-pekko` = (project in file("instrumentation/kamon-pekko"))
   .settings(instrumentationSettings: _*)
   .settings(Seq(
     crossScalaVersions := Seq(`scala_2.12_version`, `scala_2.13_version`, scala_3_version),
+
     libraryDependencies ++= Seq(
       "org.apache.pekko" %% "pekko-actor" % pekkoHttpVersion % "provided"
     )

diff --git a/...http/src/main/scala/kamon/instrumentation/pekko/http/PekkoHttpServerInstrumentation.scala b/...http/src/main/scala/kamon/instrumentation/pekko/http/PekkoHttpServerInstrumentation.scala
@@ -16,7 +16,9 @@ import org.apache.pekko.http.scaladsl.server.RouteResult.Rejected
 import org.apache.pekko.http.scaladsl.server._
 import org.apache.pekko.http.scaladsl.server.directives.RouteDirectives.reject
 import org.apache.pekko.http.scaladsl.server.directives.{BasicDirectives, CompleteOrRecoverWithMagnet, OnSuccessMagnet}
+
 import org.apache.pekko.http.scaladsl.server.util.{Tuple, Tupler}
+
 import org.apache.pekko.stream.scaladsl.Flow
 
 import java.util.concurrent.Callable

diff --git a/...mentation/kamon-pekko/src/test/scala/kamon/instrumentation/pekko/MessageTracingSpec.scala b/...mentation/kamon-pekko/src/test/scala/kamon/instrumentation/pekko/MessageTracingSpec.scala
@@ -38,6 +38,7 @@ class MessageTracingSpec extends TestKit(ActorSystem("MessageTracing")) with Any
       traced ! "ping"
       expectMsg("pong")
 
+
       eventually(timeout(4 seconds)) {
         val span = testSpanReporter().nextSpan().value
         val spanTags = stringTag(span) _
@@ -122,6 +123,7 @@ class MessageTracingSpec extends TestKit(ActorSystem("MessageTracing")) with Any
       expectMsg("pong")
 
       // Span for the first actor message
+
       val firstSpanID = eventually(timeout(4 seconds)) {
         val span = testSpanReporter().nextSpan().value
         val spanTags = stringTag(span) _

diff --git a/project/Build.scala b/project/Build.scala
@@ -61,6 +61,7 @@ object BaseProject extends AutoPlugin {
     val `scala_2.13_version` = "2.13.8"
     val scala_3_version = "3.3.1"
 
+
     // This installs the GPG signing key from the
     setupGpg()