[GitHub] [nifi-minifi-cpp] adamdebreceni commented on a change in pull request #1081: MINIFICPP-1565: Minor improvements to PerformanceDataMonitor

[GitBox]

adamdebreceni commented on a change in pull request #1081:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1081#discussion_r640389173



##########
File path: extensions/pdh/PerformanceDataMonitor.cpp
##########
@@ -249,32 +265,56 @@ void 
PerformanceDataMonitor::addCustomPDHCountersFromProperty(const std::string&
   }
 }
 
-void PerformanceDataMonitor::setupMembersFromProperties(const 
std::shared_ptr<core::ProcessContext>& context) {
-  std::string predefined_groups;
-  if (context->getProperty(PredefinedGroups.getName(), predefined_groups)) {
-    logger_->log_trace("Predefined group configured to be %s", 
predefined_groups);
-    addCountersFromPredefinedGroupsProperty(predefined_groups);
-  }
-
+void PerformanceDataMonitor::setupCountersFromProperties(const 
std::shared_ptr<core::ProcessContext>& context) {
   std::string custom_pdh_counters;
   if (context->getProperty(CustomPDHCounters.getName(), custom_pdh_counters)) {
     logger_->log_trace("Custom PDH counters configured to be %s", 
custom_pdh_counters);
     addCustomPDHCountersFromProperty(custom_pdh_counters);
   }
+}
 
+void PerformanceDataMonitor::setupPredefinedGroupsFromProperties(const 
std::shared_ptr<core::ProcessContext>& context) {
+  std::string predefined_groups;
+  if (context->getProperty(PredefinedGroups.getName(), predefined_groups)) {
+    logger_->log_trace("Predefined group configured to be %s", 
predefined_groups);
+    addCountersFromPredefinedGroupsProperty(predefined_groups);
+  }
+}
+
+void PerformanceDataMonitor::setupOutputFormatFromProperties(const 
std::shared_ptr<core::ProcessContext>& context) {
   std::string output_format_string;
   if (context->getProperty(OutputFormatProperty.getName(), 
output_format_string)) {
-    if (output_format_string == OPEN_TELEMETRY_FORMAT_STR) {
-      logger_->log_trace("OutputFormat is configured to be OpenTelemetry");
+    if (output_format_string == PRETTY_OPEN_TELEMETRY_FORMAT_STR || 
output_format_string == COMPACT_OPEN_TELEMETRY_FORMAT_STR) {
       output_format_ = OutputFormat::OPENTELEMETRY;
-    } else if (output_format_string == JSON_FORMAT_STR) {
-      logger_->log_trace("OutputFormat is configured to be JSON");
+      pretty_output_ = output_format_string == 
PRETTY_OPEN_TELEMETRY_FORMAT_STR;
+    } else if (output_format_string == PRETTY_JSON_FORMAT_STR || 
output_format_string == COMPACT_JSON_FORMAT_STR) {
       output_format_ = OutputFormat::JSON;
+      pretty_output_ = output_format_string == PRETTY_JSON_FORMAT_STR;
     } else {
-      logger_->log_error("Invalid OutputFormat, defaulting to JSON");
-      output_format_ = OutputFormat::JSON;
+      throw std::invalid_argument(("Invalid PerformanceDataMonitor Output 
Format: %s", output_format_string));
     }
   }
+  logger_->log_trace("OutputFormat is configured to be %s %s", pretty_output_ 
? "pretty" : "compact", output_format_ == OutputFormat::JSON ? "JSON" : 
"OpenTelemtry");
+}
+
+void PerformanceDataMonitor::setupDecimalPlacesFromProperties(const 
std::shared_ptr<core::ProcessContext>& context) {
+  std::string decimal_places_str;
+  if (context->getProperty(DecimalPlaces.getName(), decimal_places_str)) {  // 
TODO(mzink): Implement int8_t in Value.h to convert int8_t implicitly
+    try {
+      decimal_places_ = std::stoi(decimal_places_str);

Review comment:
       yes, we could go for that, and throw on out-of-range as well




-- 
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.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org