Skip to content

Correctly support Pekko HTTP in PlayServerInstrumentation #1402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ivantopo merged 1 commit into from
Jul 1, 2025
Merged

Correctly support Pekko HTTP in PlayServerInstrumentation #1402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 29 additions & 5 deletions ...tion/kamon-play/src/main/scala/kamon/instrumentation/play/PlayServerInstrumentation.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ import io.netty.handler.codec.http.{HttpRequest, HttpResponse}
import io.netty.util.concurrent.GenericFutureListener
import kamon.{ClassLoading, Kamon}
import kamon.context.Storage
import kamon.instrumentation.akka.http.ServerFlowWrapper
import kamon.instrumentation.akka.http.{ServerFlowWrapper => AkkaHttpServerFlowWrapper}
import kamon.instrumentation.pekko.http.{ServerFlowWrapper => PekkoHttpServerFlowWrapper}
import kamon.instrumentation.context.{CaptureCurrentTimestampOnExit, HasTimestamp}
import kamon.instrumentation.http.HttpServerInstrumentation.RequestHandler
import kamon.instrumentation.http.{HttpMessage, HttpServerInstrumentation}
Expand All @@ -52,7 +53,18 @@ class PlayServerInstrumentation extends InstrumentationBuilder {
.when(classIsPresent("play.core.server.AkkaHttpServerProvider"))
.advise(
anyMethods("createServerBinding", "play$core$server$AkkaHttpServer$$createServerBinding"),
CreateServerBindingAdvice
CreateAkkaHttpServerBindingAdvice
)

/**
* When using the Pekko HTTP server, we will use the exact same instrumentation that comes from the Pekko HTTP module,
* the only difference here is that we will change the component name.
*/
onType("play.core.server.PekkoHttpServer")
.when(classIsPresent("play.core.server.PekkoHttpServerProvider"))
.advise(
anyMethods("createServerBinding", "play$core$server$PekkoHttpServer$$createServerBinding"),
CreatePekkoHttpServerBindingAdvice
)

/**
Expand Down Expand Up @@ -87,15 +99,27 @@ class PlayServerInstrumentation extends InstrumentationBuilder {

}

object CreateServerBindingAdvice {
object CreateAkkaHttpServerBindingAdvice {

@Advice.OnMethodEnter
def enter(): Unit =
AkkaHttpServerFlowWrapper.changeSettings("play.server.akka-http", "kamon.instrumentation.play.http.server")

@Advice.OnMethodExit
def exit(): Unit =
AkkaHttpServerFlowWrapper.resetSettings()

}

object CreatePekkoHttpServerBindingAdvice {

@Advice.OnMethodEnter
def enter(): Unit =
ServerFlowWrapper.changeSettings("play.server.akka-http", "kamon.instrumentation.play.http.server")
PekkoHttpServerFlowWrapper.changeSettings("play.server.pekko-http", "kamon.instrumentation.play.http.server")

@Advice.OnMethodExit
def exit(): Unit =
ServerFlowWrapper.resetSettings()
PekkoHttpServerFlowWrapper.resetSettings()

}

Expand Down
2 changes: 1 addition & 1 deletion ...on-play/src/test-common/scala/kamon/instrumentation/play/RequestInstrumentationSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class AkkaHTTPRequestHandlerInstrumentationSpec extends {
} else {
(
"/instrumentation/kamon-play/src/test-common/resources/conf/application-pekko-http.conf",
"pekko.http.server"
"play.server.pekko-http"
)
}
}
Expand Down