diff --git a/build.sbt b/build.sbt index a69dc4b5a..ffbe0f9c1 100644 --- 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/instrumentation/kamon-pekko-http/src/main/scala/kamon/instrumentation/pekko/http/PekkoHttpServerInstrumentation.scala b/instrumentation/kamon-pekko-http/src/main/scala/kamon/instrumentation/pekko/http/PekkoHttpServerInstrumentation.scala index 561909a4c..c3e5835c4 100644 --- a/instrumentation/kamon-pekko-http/src/main/scala/kamon/instrumentation/pekko/http/PekkoHttpServerInstrumentation.scala +++ b/instrumentation/kamon-pekko-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/instrumentation/kamon-pekko/src/test/scala/kamon/instrumentation/pekko/MessageTracingSpec.scala b/instrumentation/kamon-pekko/src/test/scala/kamon/instrumentation/pekko/MessageTracingSpec.scala index 5fc20ecd4..73a7c8fa8 100644 --- a/instrumentation/kamon-pekko/src/test/scala/kamon/instrumentation/pekko/MessageTracingSpec.scala +++ b/instrumentation/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 index cbe479060..ea760edd0 100644 --- 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()