Merge pull request #328 from uptane/listener-name

Allow setting listener name
uptane · Dec 4, 2023 · a08b4ca · a08b4ca
2 parents 7efac7c + a24d253
commit a08b4ca
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 12 deletions.
diff --git a/...saging/src/main/scala/com/advancedtelematic/libats/messaging/MessageListenerSupport.scala b/...saging/src/main/scala/com/advancedtelematic/libats/messaging/MessageListenerSupport.scala
@@ -12,20 +12,27 @@ trait MessageListenerSupport {
 
   import system.dispatcher
 
-  def startListener[T](op: MsgOperation[T], busListenerMonitor: ListenerMonitor, skipProcessingErrors: Boolean = false)
-                      (implicit ml: MessageLike[T]): ActorRef = {
+  def startListener[T](op: MsgOperation[T],
+                       busListenerMonitor: ListenerMonitor,
+                       skipProcessingErrors: Boolean = false,
+                       actorNamePrefix: Option[String] = None)(
+      implicit ml: MessageLike[T]): ActorRef = {
     val loggedOperation =
-      if(skipProcessingErrors)
+      if (skipProcessingErrors)
         MsgOperation.recoverFailed(op)(system.log, system.dispatcher)
       else
         MsgOperation.logFailed(op)(system.log, system.dispatcher)
 
-    val groupId = if (globalConfig.hasPath("ats.messaging.groupIdPrefix"))
-      globalConfig.getString("ats.messaging.groupIdPrefix")
-    else
-      projectName
+    val groupId =
+      if (globalConfig.hasPath("ats.messaging.groupIdPrefix"))
+        globalConfig.getString("ats.messaging.groupIdPrefix")
+      else
+        projectName
 
-    val ref = system.actorOf(MessageListener.props[T](globalConfig, loggedOperation, groupId, busListenerMonitor),  ml.streamName + "-listener")
+    val ref = system.actorOf(
+      MessageListener
+        .props[T](globalConfig, loggedOperation, groupId, busListenerMonitor),
+      actorNamePrefix.getOrElse("") + ml.streamName + "-listener")
     ref ! Subscribe
     ref
   }

diff --git a/...in/scala/com/advancedtelematic/libats/messaging/metrics/MonitoredBusListenerSupport.scala b/...in/scala/com/advancedtelematic/libats/messaging/metrics/MonitoredBusListenerSupport.scala
@@ -7,10 +7,15 @@ import com.advancedtelematic.libats.messaging.MsgOperation.MsgOperation
 import com.advancedtelematic.libats.messaging_datatype.MessageLike
 
 trait MonitoredBusListenerSupport {
-  self: BootApp with MessageListenerSupport =>
+  self: BootApp & MessageListenerSupport =>
 
-  def startMonitoredListener[T : MessageLike](op: MsgOperation[T],
-                                              skipProcessingErrors: Boolean = false): ActorRef = {
-    startListener(op, PrometheusMessagingMonitor[T](), skipProcessingErrors)
+  def startMonitoredListener[T: MessageLike](
+      op: MsgOperation[T],
+      skipProcessingErrors: Boolean = false,
+      actorNamePrefix: Option[String] = None): ActorRef = {
+    startListener(op,
+                  PrometheusMessagingMonitor[T](),
+                  skipProcessingErrors,
+                  actorNamePrefix)
   }
 }