Merge pull request #85 from AxonIQ/fix/demo-fixes

Demo fixes
AxonIQ · Aug 29, 2024 · be1199c · be1199c
2 parents 0ec08e1 + 044d80c
commit be1199c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 6 deletions.
diff --git a/...lient/src/main/java/io/axoniq/console/framework/AxoniqConsoleEnhancingConfigurerModule.kt b/...lient/src/main/java/io/axoniq/console/framework/AxoniqConsoleEnhancingConfigurerModule.kt
@@ -6,7 +6,7 @@
  * You may obtain a copy of the License at
  *
  *    http://www.apache.org/licenses/LICENSE-2.0
- *
+ *    
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,21 +21,26 @@ import io.axoniq.console.framework.application.BusType
 import io.axoniq.console.framework.application.MeasuringExecutorServiceDecorator
 import io.axoniq.console.framework.messaging.SpanMatcherPredicateMap
 import io.axoniq.console.framework.util.PostProcessHelper
+import org.axonframework.commandhandling.CommandBus
 import org.axonframework.common.ReflectionUtils
 import org.axonframework.config.Configurer
 import org.axonframework.config.ConfigurerModule
+import org.axonframework.queryhandling.QueryBus
 import java.lang.reflect.Field
 import java.util.concurrent.ExecutorService
 
 class AxoniqConsoleEnhancingConfigurerModule(private val spanMatcherPredicateMap: SpanMatcherPredicateMap) : ConfigurerModule {
     override fun configureModule(configurer: Configurer) {
         configurer.onInitialize { configuration ->
             configuration.onStart {
+                enhance(configuration.spanFactory())
                 enhance(configuration.eventStore())
                 enhance(configuration.commandBus())
-                enhanceExecutorService(configuration.commandBus(), BusType.COMMAND, configuration.getComponent(ApplicationMetricRegistry::class.java))
+                val commandBus = configuration.commandBus().unwrapPossiblyDecoratedClass(CommandBus::class.java)
+                enhanceExecutorService(commandBus, BusType.COMMAND, configuration.getComponent(ApplicationMetricRegistry::class.java))
                 enhance(configuration.queryBus())
-                enhanceExecutorService(configuration.queryBus(), BusType.QUERY, configuration.getComponent(ApplicationMetricRegistry::class.java))
+                val queryBus = configuration.queryBus().unwrapPossiblyDecoratedClass(QueryBus::class.java)
+                enhanceExecutorService(queryBus, BusType.QUERY, configuration.getComponent(ApplicationMetricRegistry::class.java))
                 enhance(configuration.queryUpdateEmitter())
                 enhance(configuration.snapshotter())
                 enhance(configuration.deadlineManager())

diff --git a/console-framework-client/src/main/java/io/axoniq/console/framework/messaging/extensions.kt b/console-framework-client/src/main/java/io/axoniq/console/framework/messaging/extensions.kt
@@ -6,7 +6,7 @@
  * You may obtain a copy of the License at
  *
  *    http://www.apache.org/licenses/LICENSE-2.0
- *
+ *    
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -57,11 +57,13 @@ fun String.toSimpleName() = split(".").last()
 
 fun UnitOfWork<*>.extractHandler(declaringClassName: String, processingGroup: String?): HandlerStatisticsMetricIdentifier? = try {
     val isAggregate = message is CommandMessage<*> && isAggregateLifecycleActive()
-    val isProcessor = processingGroup != null
+
+    val processorName = AxoniqConsoleSpanFactory.currentSpan()?.processorName
+    val isProcessor = processorName != null
 
     val component = when {
         isAggregate -> (AggregateLifecycle.describeCurrentScope() as AggregateScopeDescriptor).type
-        isProcessor -> processingGroup ?: AxoniqConsoleSpanFactory.currentSpan()?.processorName
+        isProcessor -> createCombinedProcessorAndGroupIdentifier(processorName!!, processingGroup)
         else -> declaringClassName
     }
     val type = when {
@@ -79,6 +81,17 @@ fun UnitOfWork<*>.extractHandler(declaringClassName: String, processingGroup: St
     null
 }
 
+/**
+ * If the processing group name differents from the processor, we can assume multiple groups are under the same one.
+ * Using the [::] operator to separate the processor name from the processing group, we can filter in the UI.
+ */
+fun createCombinedProcessorAndGroupIdentifier(processorName: String, processingGroup: String?): String {
+    if (processingGroup == null || processingGroup == processorName) {
+        return processorName
+    }
+    return "$processorName::$processingGroup"
+}
+
 
 fun isAggregateLifecycleActive(): Boolean {
     return try {