fgerlits commented on code in PR #1400: URL: https://github.com/apache/nifi-minifi-cpp/pull/1400#discussion_r1001738406
########## docker/test/integration/minifi/core/PrometheusChecker.py: ########## @@ -0,0 +1,90 @@ +import time +from prometheus_api_client import PrometheusConnect + + +class PrometheusChecker: + def __init__(self): + self.prometheus_client = PrometheusConnect(url="http://localhost:9090";, disable_ssl=True) + + def wait_for_metric_class_on_prometheus(self, metric_class, timeout_seconds): + start_time = time.perf_counter() + while (time.perf_counter() - start_time) < timeout_seconds: + if self.verify_metric_class(metric_class): + return True + time.sleep(1) + return False + + def wait_for_processor_metric_on_prometheus(self, metric_class, timeout_seconds, processor_name): + start_time = time.perf_counter() + while (time.perf_counter() - start_time) < timeout_seconds: + if self.verify_processor_metric(metric_class, processor_name): + return True + time.sleep(1) + return False + + def verify_processor_metric(self, metric_class, processor_name): + if metric_class == "GetFileMetrics": + return self.verify_getfile_metrics(metric_class, processor_name) + else: + return self.verify_general_processor_metrics(metric_class, processor_name) + + def verify_metric_class(self, metric_class): + if metric_class == "RepositoryMetrics": + return self.verify_repository_metrics() + elif metric_class == "QueueMetrics": + return self.verify_queue_metrics() + elif metric_class == "FlowInformation": + return self.verify_flow_information_metrics() + elif metric_class == "DeviceInfoNode": + return self.verify_device_info_node_metrics() + else: + raise Exception("Metric class '%s' verification is not implemented" % metric_class) + + def verify_repository_metrics(self): + label_list = [{'repository_name': 'provenance'}, {'repository_name': 'flowfile'}] + for labels in label_list: + if not self.verify_metrics_exist(['minifi_is_running', 'minifi_is_full', 'minifi_repository_size'], 'RepositoryMetrics', labels): + return False + return True Review Comment: very minor, but I think ```suggestion return all((self.verify_metrics_exist(['minifi_is_running', 'minifi_is_full', 'minifi_repository_size'], 'RepositoryMetrics', labels) for labels in label_list)) ``` would be more readable (same in the `verify_metrics_exist` and `verify_metrics_larger_than_zero` functions below) ########## libminifi/src/core/ProcessSession.cpp: ########## @@ -740,7 +740,7 @@ void ProcessSession::restore(const std::string &key, const std::shared_ptr<core: flow->clearStashClaim(key); } -ProcessSession::RouteResult ProcessSession::routeFlowFile(const std::shared_ptr<FlowFile> &record) { +ProcessSession::RouteResult ProcessSession::routeFlowFile(const std::shared_ptr<FlowFile> &record, std::unordered_map<std::string, TransferMetrics>& transfers) { Review Comment: I think it would be slightly nicer to make the second parameter a `std::function<void(const FlowFile&)> record_callback` and move the definition of the lambda to `commit()`. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
