Skip to content

make kamon-pekko tolerant of null dispatcherPrerequisites #1361

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
hughsimpson merged 1 commit into from
Sep 17, 2024
Merged

make kamon-pekko tolerant of null dispatcherPrerequisites #1361

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
9 changes: 7 additions & 2 deletions ...c/main/scala/kamon/instrumentation/pekko/instrumentations/DispatcherInstrumentation.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,13 +127,18 @@ object InstrumentNewExecutorServiceOnPekko {
@SuperCall callable: Callable[ExecutorService]
): ExecutorService = {
val executor = callable.call()
val actorSystemName = factory.dispatcherPrerequisites.settings.name
val actorSystemName = if (factory.dispatcherPrerequisites != null) {
factory.dispatcherPrerequisites.settings.name
} else {
"unknown"
}
val dispatcherName = factory.dispatcherName
val scheduledActionName = actorSystemName + "/" + dispatcherName
val systemTags = TagSet.of("pekko.system", actorSystemName)

if (Kamon.filter(PekkoInstrumentation.TrackDispatcherFilterName).accept(dispatcherName)) {
val defaultEcOption = factory.dispatcherPrerequisites.defaultExecutionContext
val defaultEcOption = Option(factory.dispatcherPrerequisites)
.flatMap(_.defaultExecutionContext)

if (dispatcherName == Dispatchers.DefaultDispatcherId && defaultEcOption.isDefined) {
ExecutorInstrumentation.instrumentExecutionContext(
Expand Down