Intermediate metric consumer fix (#8)

* Change in how metrics consumer is created * Change in how metrics consumer is created
eu-nebulous · Sep 25, 2024 · b9f7e4c · b9f7e4c
1 parent b7b43fe
commit b9f7e4c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/prediction-orchestrator/pom.xml b/prediction-orchestrator/pom.xml
@@ -68,7 +68,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-collections4</artifactId>
-            <version>4.4</version>
+            <version>4.3</version>
         </dependency>
         <dependency>
             <groupId>javax.validation</groupId>

diff --git a/...louscloud/predictionorchestrator/communication/connectors/ApplicationCreationHandler.java b/...louscloud/predictionorchestrator/communication/connectors/ApplicationCreationHandler.java
@@ -38,7 +38,6 @@ public void onMessage(String key, String address, Map body, Message message, Con
                     context.registerConsumer(new RealtimeApplicationMetricConsumer(app_id));
                     break;
                 case "intermediate":
-                    context.registerConsumer(new IntermediateMetricsConsumer(predictionRegistry));
                     break;
                 default:
                     log.warn("Unknown mode: {}", mode);

diff --git a/...ava/eu/nebulouscloud/predictionorchestrator/communication/connectors/BrokerConnector.java b/...ava/eu/nebulouscloud/predictionorchestrator/communication/connectors/BrokerConnector.java
@@ -4,7 +4,9 @@
 import eu.nebulouscloud.exn.core.Consumer;
 import eu.nebulouscloud.exn.settings.StaticExnConfig;
 import eu.nebulouscloud.predictionorchestrator.Orchestrator;
+import eu.nebulouscloud.predictionorchestrator.PredictionRegistry;
 import eu.nebulouscloud.predictionorchestrator.Properties;
+import eu.nebulouscloud.predictionorchestrator.communication.consumers.IntermediateMetricsConsumer;
 import eu.nebulouscloud.predictionorchestrator.communication.consumers.MetricsListConsumer;
 import jakarta.annotation.PostConstruct;
 import lombok.extern.slf4j.Slf4j;
@@ -48,6 +50,9 @@ public class BrokerConnector {
     @Autowired
     private BrokerConnectorHandler brokerConnectorHandler;
 
+    @Autowired
+    private PredictionRegistry predictionRegistry;
+
     @PostConstruct
     public void init() {
         startConnector();
@@ -61,7 +66,9 @@ private void startConnector() {
                     brokerConnectorHandler,
                     List.of(), // List of publishers
                     List.of(new Consumer("ui_app_messages", app_creation_channel,
-                            applicationCreationHandler, true, true), new MetricsListConsumer(orchestrator, properties)),
+                            applicationCreationHandler, true, true),
+                            new MetricsListConsumer(orchestrator, properties),
+                            new IntermediateMetricsConsumer(predictionRegistry)),
                     true, // enableState
                     true, // enableHealth
                     new StaticExnConfig(host, port, username, password, retryAttempts) // Configuration