diff options
author | Jozsef Csongvai <jozsef.csongvai@bell.ca> | 2021-10-06 11:47:23 -0400 |
---|---|---|
committer | KAPIL SINGAL <ks220y@att.com> | 2021-10-20 00:47:19 +0000 |
commit | 7a697663603a0d3a955076b1a36ce674e62d3ab7 (patch) | |
tree | 35e1584bce976a077ab08b2f6427a8c0493db444 /ms/blueprintsprocessor/modules/services/workflow-service/src/main | |
parent | 39f3fe457ab9a2e1f745bf82a7866fc404de4b04 (diff) |
Add missing code for Metrics and PV/PVC elimination
Earlier patch introducing MeterRegistry to AbstractComponentFunction
was not initializing the lateinit property and causing NPE.
Also add additional code to handle compatibility issues after the
introduction of PV/PVC elminiation for CommandExecutor. This allows
blueprintsprocessor to communicate with earlier versions of command-
executor which still use the shared pvc.
Issue-ID: CCSDK-3471
Change-Id: I84a04601c4fe09c5f3a06664ce877800a30531f1
Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca>
Diffstat (limited to 'ms/blueprintsprocessor/modules/services/workflow-service/src/main')
-rw-r--r-- | ms/blueprintsprocessor/modules/services/workflow-service/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/workflow/NodeTemplateExecutionService.kt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ms/blueprintsprocessor/modules/services/workflow-service/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/workflow/NodeTemplateExecutionService.kt b/ms/blueprintsprocessor/modules/services/workflow-service/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/workflow/NodeTemplateExecutionService.kt index 88799d102..53c327a5b 100644 --- a/ms/blueprintsprocessor/modules/services/workflow-service/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/workflow/NodeTemplateExecutionService.kt +++ b/ms/blueprintsprocessor/modules/services/workflow-service/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/services/workflow/NodeTemplateExecutionService.kt @@ -17,6 +17,7 @@ package org.onap.ccsdk.cds.blueprintsprocessor.services.workflow import com.fasterxml.jackson.databind.JsonNode +import io.micrometer.core.instrument.MeterRegistry import org.onap.ccsdk.cds.blueprintsprocessor.core.api.data.ExecutionServiceInput import org.onap.ccsdk.cds.blueprintsprocessor.core.api.data.ExecutionServiceOutput import org.onap.ccsdk.cds.blueprintsprocessor.core.api.data.StepData @@ -31,7 +32,7 @@ import org.slf4j.LoggerFactory import org.springframework.stereotype.Service @Service -open class NodeTemplateExecutionService(private val bluePrintClusterService: BluePrintClusterService) { +open class NodeTemplateExecutionService(private val bluePrintClusterService: BluePrintClusterService, private val meterRegistry: MeterRegistry) { private val log = LoggerFactory.getLogger(NodeTemplateExecutionService::class.java)!! @@ -69,6 +70,7 @@ open class NodeTemplateExecutionService(private val bluePrintClusterService: Blu plugin.bluePrintClusterService = bluePrintClusterService plugin.stepName = stepName plugin.nodeTemplateName = nodeTemplateName + plugin.meterRegistry = meterRegistry // Parent request shouldn't tamper, so need to clone the request and send to the actual component. val clonedExecutionServiceInput = ExecutionServiceInput().apply { |