You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by sz...@apache.org on 2023/03/03 13:23:48 UTC

[nifi-minifi-cpp] branch main updated (f27e349b5 -> 32043f51f)

This is an automated email from the ASF dual-hosted git repository.

szaszm pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git


    from f27e349b5 MINIFICPP-1887 Add default connection size limits
     new 9c5e2996b MINIFICPP-2041 Fix transient failure of HttpPostIntegrationTestChunked
     new 268985995 MINIFICPP-2057 Improve the performance of ListFile
     new 7942e0e7f MINIFICPP-2053 Reduce CentOS image size in CI build
     new 0a937973e MINIFICPP-2055 Remove C2 metrics from default configuration
     new 32043f51f MINIFICPP-2061 reverseDnsLookup shouldn't throw on timeout

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/workflows/ci.yml                           |  22 ++--
 cmake/DockerConfig.cmake                           |  13 +++
 conf/minifi.properties                             |  18 ++--
 docker/DockerBuild.sh                              |   7 +-
 docker/bionic/Dockerfile                           |   3 +-
 docker/centos/Dockerfile                           |  18 +++-
 docker/fedora/Dockerfile                           |   3 +-
 docker/focal/Dockerfile                            |   3 +-
 encrypt-config/tests/resources/minifi.properties   |  18 ++--
 ...th-additional-sensitive-props.minifi.properties |  18 ++--
 extensions/civetweb/processors/ListenHTTP.cpp      |   1 +
 extensions/expression-language/Expression.cpp      |  10 +-
 .../tests/ExpressionLanguageTests.cpp              |  19 +++-
 .../tests/C2ClearCoreComponentStateTest.cpp        |   2 +-
 extensions/http-curl/tests/C2LogHeartbeatTest.cpp  |   2 +-
 .../http-curl/tests/HttpPostIntegrationTest.cpp    |   2 +-
 extensions/sftp/tests/ListSFTPTests.cpp            |  42 ++++----
 .../standard-processors/processors/ListFile.cpp    | 113 +++++++++++----------
 .../standard-processors/processors/ListFile.h      |  10 +-
 .../tests/unit/ListFileTests.cpp                   |  40 ++++++--
 .../tests/unit/RetryFlowFileTests.cpp              |   4 +-
 .../tests/unit/TailFileTests.cpp                   |  50 ++++-----
 extensions/windows-event-log/tests/CWELTestUtils.h |   2 +-
 .../tests/ConsumeWindowsEventLogTests.cpp          |  14 +--
 libminifi/include/utils/IntegrationTestUtils.h     |   2 +-
 libminifi/test/LogUtils.h                          |  12 ++-
 libminifi/test/TestBase.cpp                        |  21 +++-
 libminifi/test/TestBase.h                          |  15 ++-
 .../test/azure-tests/ListAzureBlobStorageTests.cpp |   4 +-
 .../azure-tests/ListAzureDataLakeStorageTests.cpp  |   4 +-
 .../integration/OnScheduleErrorHandlingTests.cpp   |   8 +-
 .../integration/StateTransactionalityTests.cpp     |   6 +-
 .../test/resources/encrypted.minifi.properties     |  18 ++--
 33 files changed, 312 insertions(+), 212 deletions(-)


[nifi-minifi-cpp] 02/05: MINIFICPP-2057 Improve the performance of ListFile

Posted by sz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

szaszm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git

commit 2689859959e318cc679b4262b5c93b20f36228db
Author: Ferenc Gerlits <fg...@gmail.com>
AuthorDate: Fri Mar 3 14:13:32 2023 +0100

    MINIFICPP-2057 Improve the performance of ListFile
    
    - change how the Path Filter property works to match NiFi
      Before this change, files in the input root directory were always listed.
      After the change, the files in the input root directory are only listed if
      the value of the Path Filter property matches ".".
    
      Also to match NiFi's behavior, we now ignore the Path Filter property if
      Recurse Subdirectories is false.
    - list file even if we can't read its last_modification_time
    - fix a bug in the handling of files with the same modification time (probably never happens in real life)
    
    Closes #1518
    Signed-off-by: Marton Szasz <sz...@apache.org>
---
 .../standard-processors/processors/ListFile.cpp    | 113 +++++++++++----------
 .../standard-processors/processors/ListFile.h      |  10 +-
 .../tests/unit/ListFileTests.cpp                   |  38 ++++++-
 3 files changed, 95 insertions(+), 66 deletions(-)

diff --git a/extensions/standard-processors/processors/ListFile.cpp b/extensions/standard-processors/processors/ListFile.cpp
index 579728642..0365a6e9a 100644
--- a/extensions/standard-processors/processors/ListFile.cpp
+++ b/extensions/standard-processors/processors/ListFile.cpp
@@ -19,6 +19,7 @@
 #include <filesystem>
 
 #include "utils/StringUtils.h"
+#include "utils/TimeUtil.h"
 #include "core/PropertyBuilder.h"
 #include "core/Resource.h"
 
@@ -94,7 +95,6 @@ void ListFile::onSchedule(const std::shared_ptr<core::ProcessContext> &context,
   }
   state_manager_ = std::make_unique<minifi::utils::ListingStateManager>(state_manager);
 
-  std::string input_directory_str;
   if (auto input_directory_str = context->getProperty(InputDirectory); !input_directory_str || input_directory_str->empty()) {
     throw Exception(PROCESS_SCHEDULE_EXCEPTION, "Input Directory property missing or invalid");
   } else {
@@ -102,12 +102,13 @@ void ListFile::onSchedule(const std::shared_ptr<core::ProcessContext> &context,
   }
 
   context->getProperty(RecurseSubdirectories.getName(), recurse_subdirectories_);
+
   std::string value;
   if (context->getProperty(FileFilter.getName(), value) && !value.empty()) {
     file_filter_ = std::regex(value);
   }
 
-  if (context->getProperty(PathFilter.getName(), value) && !value.empty()) {
+  if (recurse_subdirectories_ && context->getProperty(PathFilter.getName(), value) && !value.empty()) {
     path_filter_ = std::regex(value);
   }
 
@@ -137,35 +138,49 @@ bool ListFile::fileMatchesFilters(const ListedFile& listed_file) {
     return false;
   }
 
-  if (file_filter_ && !std::regex_match(listed_file.filename.string(), *file_filter_)) {
-    logger_->log_debug("File '%s' does not match file filter so it will not be listed", listed_file.full_file_path.string());
-    return false;
-  }
+  if (file_filter_) {
+    const auto file_name = listed_file.full_file_path.filename();
 
-  if (path_filter_ && listed_file.relative_path != "." && !std::regex_match(listed_file.relative_path.string(), *path_filter_)) {
-    logger_->log_debug("Relative path '%s' does not match path filter so file '%s' will not be listed", listed_file.relative_path.string(), listed_file.full_file_path.string());
-    return false;
+    if (!std::regex_match(file_name.string(), *file_filter_)) {
+      logger_->log_debug("File '%s' does not match file filter so it will not be listed", listed_file.full_file_path.string());
+      return false;
+    }
   }
 
-  auto file_age = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now() - listed_file.getLastModified());
-  if (minimum_file_age_ && file_age < *minimum_file_age_) {
-    logger_->log_debug("File '%s' does not meet the minimum file age requirement so it will not be listed", listed_file.full_file_path.string());
-    return false;
+  if (path_filter_) {
+    const auto relative_path = std::filesystem::relative(listed_file.full_file_path.parent_path(), input_directory_);
+    if (!std::regex_match(relative_path.string(), *path_filter_)) {
+      logger_->log_debug("Relative path '%s' does not match path filter so file '%s' will not be listed", relative_path.string(), listed_file.full_file_path.string());
+      return false;
+    }
   }
 
-  if (maximum_file_age_ && file_age > *maximum_file_age_) {
-    logger_->log_debug("File '%s' does not meet the maximum file age requirement so it will not be listed", listed_file.full_file_path.string());
-    return false;
-  }
+  if (minimum_file_age_ || maximum_file_age_) {
+    const auto file_age = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now() - listed_file.getLastModified());
 
-  if (minimum_file_size_ && listed_file.file_size < *minimum_file_size_) {
-    logger_->log_debug("File '%s' does not meet the minimum file size requirement so it will not be listed", listed_file.full_file_path.string());
-    return false;
+    if (minimum_file_age_ && file_age < *minimum_file_age_) {
+      logger_->log_debug("File '%s' does not meet the minimum file age requirement so it will not be listed", listed_file.full_file_path.string());
+      return false;
+    }
+
+    if (maximum_file_age_ && file_age > *maximum_file_age_) {
+      logger_->log_debug("File '%s' does not meet the maximum file age requirement so it will not be listed", listed_file.full_file_path.string());
+      return false;
+    }
   }
 
-  if (maximum_file_size_ && *maximum_file_size_ < listed_file.file_size) {
-    logger_->log_debug("File '%s' does not meet the maximum file size requirement so it will not be listed", listed_file.full_file_path.string());
-    return false;
+  if (minimum_file_size_ || maximum_file_size_) {
+    const auto file_size = utils::file::file_size(listed_file.full_file_path);
+
+    if (minimum_file_size_ && file_size < *minimum_file_size_) {
+      logger_->log_debug("File '%s' does not meet the minimum file size requirement so it will not be listed", listed_file.full_file_path.string());
+      return false;
+    }
+
+    if (maximum_file_size_ && *maximum_file_size_ < file_size) {
+      logger_->log_debug("File '%s' does not meet the maximum file size requirement so it will not be listed", listed_file.full_file_path.string());
+      return false;
+    }
   }
 
   return true;
@@ -173,17 +188,14 @@ bool ListFile::fileMatchesFilters(const ListedFile& listed_file) {
 
 std::shared_ptr<core::FlowFile> ListFile::createFlowFile(core::ProcessSession& session, const ListedFile& listed_file) {
   auto flow_file = session.create();
-  session.putAttribute(flow_file, core::SpecialFlowAttribute::FILENAME, listed_file.filename.string());
-  session.putAttribute(flow_file, core::SpecialFlowAttribute::ABSOLUTE_PATH, listed_file.absolute_path.string());
-  session.putAttribute(flow_file, core::SpecialFlowAttribute::PATH, listed_file.relative_path == "." ?
-    (std::filesystem::path(".") / "").string() : (listed_file.relative_path / "").string());
-  session.putAttribute(flow_file, "file.size", std::to_string(listed_file.file_size));
-  if (auto last_modified_str = utils::file::FileUtils::get_last_modified_time_formatted_string(listed_file.full_file_path, "%Y-%m-%dT%H:%M:%SZ")) {
-    session.putAttribute(flow_file, "file.lastModifiedTime", *last_modified_str);
-  } else {
-    session.putAttribute(flow_file, "file.lastModifiedTime", "");
-    logger_->log_warn("Could not get last modification time of file '%s'", listed_file.full_file_path.string());
-  }
+  session.putAttribute(flow_file, core::SpecialFlowAttribute::FILENAME, listed_file.full_file_path.filename().string());
+  session.putAttribute(flow_file, core::SpecialFlowAttribute::ABSOLUTE_PATH, (listed_file.full_file_path.parent_path() / "").string());
+
+  auto relative_path = std::filesystem::relative(listed_file.full_file_path.parent_path(), input_directory_);
+  session.putAttribute(flow_file, core::SpecialFlowAttribute::PATH, (relative_path / "").string());
+
+  session.putAttribute(flow_file, "file.size", std::to_string(utils::file::file_size(listed_file.full_file_path)));
+  session.putAttribute(flow_file, "file.lastModifiedTime", utils::timeutils::getDateTimeStr(std::chrono::time_point_cast<std::chrono::seconds>(listed_file.last_modified_time)));
 
   if (auto permission_string = utils::file::FileUtils::get_permission_string(listed_file.full_file_path)) {
     session.putAttribute(flow_file, "file.permissions", *permission_string);
@@ -221,39 +233,32 @@ void ListFile::onTrigger(const std::shared_ptr<core::ProcessContext> &context, c
   auto latest_listing_state = stored_listing_state;
   uint32_t files_listed = 0;
 
-  auto file_list = utils::file::FileUtils::list_dir_all(input_directory_, logger_, recurse_subdirectories_);
-  for (const auto& [path, filename] : file_list) {
+  auto process_files = [&](const std::filesystem::path& path, const std::filesystem::path& filename) {
     ListedFile listed_file;
     listed_file.full_file_path = path / filename;
-    listed_file.absolute_path = path / "";
-    if (auto relative_path = utils::file::FileUtils::get_relative_path(path, input_directory_)) {
-      listed_file.relative_path = *relative_path;
-    } else {
-      logger_->log_warn("Failed to get group of file '%s' to input directory '%s'", listed_file.full_file_path.string(), input_directory_.string());
-    }
-    listed_file.file_size = utils::file::FileUtils::file_size(listed_file.full_file_path);
-    listed_file.filename = filename;
-    if (auto last_modified_time = utils::file::FileUtils::last_write_time(listed_file.full_file_path)) {
-      listed_file.last_modified_time = *last_modified_time;
+    if (auto last_modified_time = utils::file::last_write_time(listed_file.full_file_path)) {
+      listed_file.last_modified_time = std::chrono::time_point_cast<std::chrono::milliseconds>(utils::file::to_sys(*last_modified_time));
     } else {
-      logger_->log_error("Could not get last modification time of file '%s'", listed_file.full_file_path.string());
-      continue;
-    }
-
-    if (!fileMatchesFilters(listed_file)) {
-      continue;
+      logger_->log_warn("Could not get last modification time of file '%s'", listed_file.full_file_path.string());
+      listed_file.last_modified_time = {};
     }
 
     if (stored_listing_state.wasObjectListedAlready(listed_file)) {
       logger_->log_debug("File '%s' was already listed.", listed_file.full_file_path.string());
-      continue;
+      return true;
+    }
+
+    if (!fileMatchesFilters(listed_file)) {
+      return true;
     }
 
     auto flow_file = createFlowFile(*session, listed_file);
     session->transfer(flow_file, Success);
     ++files_listed;
     latest_listing_state.updateState(listed_file);
-  }
+    return true;
+  };
+  utils::file::list_dir(input_directory_, process_files, logger_, recurse_subdirectories_);
 
   state_manager_->storeState(latest_listing_state);
 
diff --git a/extensions/standard-processors/processors/ListFile.h b/extensions/standard-processors/processors/ListFile.h
index 05b72ba23..970f28cf0 100644
--- a/extensions/standard-processors/processors/ListFile.h
+++ b/extensions/standard-processors/processors/ListFile.h
@@ -81,19 +81,15 @@ class ListFile : public core::Processor {
  private:
   struct ListedFile : public utils::ListedObject {
     [[nodiscard]] std::chrono::time_point<std::chrono::system_clock> getLastModified() const override {
-      return std::chrono::time_point_cast<std::chrono::milliseconds>(utils::file::FileUtils::to_sys(last_modified_time));
+      return last_modified_time;
     }
 
     [[nodiscard]] std::string getKey() const override {
-      return absolute_path.string();
+      return full_file_path.string();
     }
 
-    std::filesystem::path filename;
-    std::filesystem::path absolute_path;
-    std::filesystem::file_time_type last_modified_time;
-    std::filesystem::path relative_path;
+    std::chrono::time_point<std::chrono::system_clock> last_modified_time;
     std::filesystem::path full_file_path;
-    uint64_t file_size = 0;
   };
 
   bool fileMatchesFilters(const ListedFile& listed_file);
diff --git a/extensions/standard-processors/tests/unit/ListFileTests.cpp b/extensions/standard-processors/tests/unit/ListFileTests.cpp
index 32172c05f..7428f4a7c 100644
--- a/extensions/standard-processors/tests/unit/ListFileTests.cpp
+++ b/extensions/standard-processors/tests/unit/ListFileTests.cpp
@@ -166,10 +166,17 @@ TEST_CASE_METHOD(ListFileTestFixture, "Test listing files matching the File Filt
 TEST_CASE_METHOD(ListFileTestFixture, "Test listing files matching the Path Filter pattern", "[testListFile]") {
   plan_->setProperty(list_file_processor_, "Path Filter", "first.*");
   test_controller_.runSession(plan_);
-  REQUIRE(verifyLogLinePresenceInPollTime(3s, "key:filename value:standard_file.log"));
-  REQUIRE(verifyLogLinePresenceInPollTime(3s, "key:filename value:empty_file.txt"));
-  REQUIRE(verifyLogLinePresenceInPollTime(3s, "key:filename value:sub_file_one.txt"));
-  REQUIRE(LogTestController::getInstance().countOccurrences("key:filename value:sub_file_two.txt") == 0);
+  CHECK(verifyLogLinePresenceInPollTime(3s, "key:filename value:sub_file_one.txt"));
+  CHECK(LogTestController::getInstance().countOccurrences("key:filename value:") == 1);
+}
+
+TEST_CASE_METHOD(ListFileTestFixture, "Test listing files matching the Path Filter pattern when the pattern also matches .", "[testListFile]") {
+  plan_->setProperty(list_file_processor_, "Path Filter", "second.*|\\.");
+  test_controller_.runSession(plan_);
+  CHECK(verifyLogLinePresenceInPollTime(3s, "key:filename value:standard_file.log"));
+  CHECK(verifyLogLinePresenceInPollTime(3s, "key:filename value:empty_file.txt"));
+  CHECK(verifyLogLinePresenceInPollTime(3s, "key:filename value:sub_file_two.txt"));
+  CHECK(LogTestController::getInstance().countOccurrences("key:filename value:") == 3);
 }
 
 TEST_CASE_METHOD(ListFileTestFixture, "Test listing files with restriction on the minimum file age", "[testListFile]") {
@@ -221,7 +228,7 @@ TEST_CASE_METHOD(ListFileTestFixture, "Test listing hidden files", "[testListFil
 TEST_CASE("ListFile sets attributes correctly") {
   using minifi::processors::ListFile;
 
-  const auto list_file = std::make_shared<ListFile>("GetFile");
+  const auto list_file = std::make_shared<ListFile>("ListFile");
   LogTestController::getInstance().setTrace<ListFile>();
   minifi::test::SingleProcessorTestController test_controller(list_file);
   std::filesystem::path dir = test_controller.createTempDirectory();
@@ -247,4 +254,25 @@ TEST_CASE("ListFile sets attributes correctly") {
   }
 }
 
+TEST_CASE("If a second file with the same modification time shows up later, then it will get listed") {
+  using minifi::processors::ListFile;
+
+  const auto list_file = std::make_shared<ListFile>("ListFile");
+  minifi::test::SingleProcessorTestController test_controller(list_file);
+
+  const auto input_dir = test_controller.createTempDirectory();
+  list_file->setProperty(ListFile::InputDirectory, input_dir.string());
+
+  const auto common_timestamp = std::chrono::file_clock::now();
+
+  const auto file_one = utils::putFileToDir(input_dir, "file_one.txt", "When I was one, I had just begun.");
+  std::filesystem::last_write_time(file_one, common_timestamp);
+  const auto result_one = test_controller.trigger();
+  CHECK(result_one.at(ListFile::Success).size() == 1);
+
+  const auto file_two = utils::putFileToDir(input_dir, "file_two.txt", "When I was two, I was nearly new.");
+  std::filesystem::last_write_time(file_two, common_timestamp);
+  const auto result_two = test_controller.trigger();
+  CHECK(result_two.at(ListFile::Success).size() == 1);
+}
 }  // namespace


[nifi-minifi-cpp] 03/05: MINIFICPP-2053 Reduce CentOS image size in CI build

Posted by sz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

szaszm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git

commit 7942e0e7f344d449bb8b4635b1a8737caf57bce5
Author: Gabor Gyimesi <ga...@gmail.com>
AuthorDate: Fri Mar 3 14:16:42 2023 +0100

    MINIFICPP-2053 Reduce CentOS image size in CI build
    
    It started to occur that the CentOS build exceeded the 14GB disk space
    Github Actions VMs provide (for example
    https://github.com/apache/nifi-minifi-cpp/actions/runs/4263514879/jobs/7420351598).
    JDK and the packaged tar.gz are removed from the CI build and JNI and
    SFTP builds are moved to the ubuntu build. This reduces the image size
    by about 2GBs.
    
    Closes #1513
    Signed-off-by: Marton Szasz <sz...@apache.org>
---
 .github/workflows/ci.yml | 22 ++++++++++++----------
 cmake/DockerConfig.cmake | 13 +++++++++++++
 docker/DockerBuild.sh    |  7 +++++--
 docker/bionic/Dockerfile |  3 ++-
 docker/centos/Dockerfile | 18 +++++++++++++-----
 docker/fedora/Dockerfile |  3 ++-
 docker/focal/Dockerfile  |  3 ++-
 7 files changed, 49 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9aa080554..9047e87d4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -104,7 +104,7 @@ jobs:
           export CC=gcc-11
           export CXX=g++-11
           cmake -DUSE_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DCI_BUILD=ON -DSTRICT_GSL_CHECKS=AUDIT -DFAIL_ON_WARNINGS=ON -DENABLE_SQL=OFF -DENABLE_LIBRDKAFKA=OFF -DENABLE_AWS=OFF \
-              -DENABLE_AZURE=OFF -DENABLE_SPLUNK=OFF -DENABLE_GCP=OFF -DENABLE_PROCFS=OFF -DENABLE_BUSTACHE=ON -DENABLE_PCAP=ON ..
+              -DENABLE_AZURE=OFF -DENABLE_SPLUNK=OFF -DENABLE_GCP=OFF -DENABLE_PROCFS=OFF -DENABLE_BUSTACHE=ON -DENABLE_PCAP=ON -DENABLE_JNI=ON -DENABLE_SFTP=ON ..
           make -j$(nproc) VERBOSE=1
       - name: test
         run: cd build && make test ARGS="--timeout 300 -j2 --output-on-failure"
@@ -143,8 +143,8 @@ jobs:
           export CXXFLAGS="${CXXFLAGS} -stdlib=libc++"
           export LDFLAGS="${LDFLAGS} -stdlib=libc++"
           cmake -DUSE_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DCI_BUILD=ON -DSTRICT_GSL_CHECKS=AUDIT -DFAIL_ON_WARNINGS=ON -DENABLE_AWS=ON -DENABLE_AZURE=ON -DENABLE_BUSTACHE=ON -DENABLE_COAP=ON \
-              -DENABLE_ENCRYPT_CONFIG=ON -DENABLE_GPS=ON -DENABLE_JNI=ON -DENABLE_LIBRDKAFKA=ON -DENABLE_MQTT=ON -DENABLE_NANOFI=ON -DENABLE_OPC=ON -DENABLE_OPENCV=ON \
-              -DENABLE_OPENWSMAN=ON -DENABLE_OPS=ON -DENABLE_PCAP=ON -DENABLE_PYTHON=ON -DENABLE_SENSORS=ON -DENABLE_SFTP=ON -DENABLE_SQL=ON -DENABLE_SYSTEMD=ON -DENABLE_TENSORFLOW=OFF \
+              -DENABLE_ENCRYPT_CONFIG=ON -DENABLE_GPS=ON -DENABLE_LIBRDKAFKA=ON -DENABLE_MQTT=ON -DENABLE_NANOFI=ON -DENABLE_OPC=ON -DENABLE_OPENCV=ON \
+              -DENABLE_OPENWSMAN=ON -DENABLE_OPS=ON -DENABLE_PCAP=ON -DENABLE_PYTHON=ON -DENABLE_SENSORS=ON -DENABLE_SQL=ON -DENABLE_SYSTEMD=ON -DENABLE_TENSORFLOW=OFF \
               -DENABLE_USB_CAMERA=ON -DENABLE_SCRIPTING=ON -DENABLE_LUA_SCRIPTING=ON -DENABLE_KUBERNETES=ON -DENABLE_GCP=ON -DENABLE_PROCFS=ON -DENABLE_PROMETHEUS=ON -DENABLE_ELASTICSEARCH=ON \
               -DCMAKE_EXPORT_COMPILE_COMMANDS=ON ..
           cmake --build . --parallel $(nproc)
@@ -196,13 +196,13 @@ jobs:
       - id: build
         run: |
           if [ -d ~/.ccache ]; then mv ~/.ccache .; fi
-          mkdir build && cd build && cmake -DUSE_SHARED_LIBS=ON -DCI_BUILD=ON -DSTRICT_GSL_CHECKS=AUDIT -DFAIL_ON_WARNINGS=ON -DENABLE_AWS=ON -DENABLE_AZURE=ON -DENABLE_COAP=ON \
-              -DENABLE_ENCRYPT_CONFIG=ON -DENABLE_GPS=ON -DENABLE_JNI=ON -DENABLE_LIBRDKAFKA=ON -DENABLE_MQTT=ON -DENABLE_NANOFI=ON -DENABLE_OPC=ON -DENABLE_OPENCV=ON \
-              -DENABLE_OPENWSMAN=ON -DENABLE_OPS=ON -DENABLE_PYTHON=ON -DENABLE_SENSORS=ON -DENABLE_SFTP=ON -DENABLE_SQL=ON -DENABLE_SYSTEMD=ON -DENABLE_TENSORFLOW=OFF \
-              -DENABLE_USB_CAMERA=ON -DENABLE_SCRIPTING=ON -DENABLE_LUA_SCRIPTING=ON -DENABLE_KUBERNETES=ON -DENABLE_GCP=ON -DENABLE_PROCFS=ON -DENABLE_PROMETHEUS=ON -DENABLE_ELASTICSEARCH=ON \
-              -DDOCKER_SKIP_TESTS=OFF -DDOCKER_BUILD_ONLY=ON -DDOCKER_CCACHE_DUMP_LOCATION=$HOME/.ccache .. && make centos
+          mkdir build && cd build && cmake -DUSE_SHARED_LIBS=ON -DCI_BUILD=ON -DSTRICT_GSL_CHECKS=AUDIT -DFAIL_ON_WARNINGS=ON -DENABLE_AWS=ON -DENABLE_AZURE=ON \
+              -DENABLE_COAP=ON -DENABLE_ENCRYPT_CONFIG=ON -DENABLE_GPS=ON -DENABLE_LIBRDKAFKA=ON -DENABLE_MQTT=ON -DENABLE_NANOFI=ON -DENABLE_OPC=ON \
+              -DENABLE_OPENCV=ON -DENABLE_OPENWSMAN=ON -DENABLE_OPS=ON -DENABLE_PYTHON=ON -DENABLE_SENSORS=ON -DENABLE_SQL=ON -DENABLE_SYSTEMD=ON \
+              -DENABLE_USB_CAMERA=ON -DENABLE_SCRIPTING=ON -DENABLE_LUA_SCRIPTING=ON -DENABLE_KUBERNETES=ON -DENABLE_GCP=ON -DENABLE_PROCFS=ON -DENABLE_PROMETHEUS=ON \
+              -DENABLE_ELASTICSEARCH=ON -DDOCKER_SKIP_TESTS=OFF -DDOCKER_BUILD_ONLY=ON -DDOCKER_CCACHE_DUMP_LOCATION=$HOME/.ccache .. && make centos-test
       - id: test
-        run: docker run --rm apacheminificpp:$(docker images | grep apacheminificpp | grep centos | awk '{print $2}') bash -c 'cd /opt/minifi/build && make test ARGS="--timeout 300 -j8 --output-on-failure"'
+        run: docker run --rm apacheminificpp:$(docker images | grep apacheminificpp | grep centos | awk '{print $2}' | head -1) bash -c 'cd /opt/minifi/build && make test ARGS="--timeout 300 -j8 --output-on-failure"'
   docker_integration_tests:
     name: "Docker integration tests"
     runs-on: ubuntu-20.04
@@ -223,7 +223,9 @@ jobs:
           if [ -d ~/.ccache ]; then mv ~/.ccache .; fi
           mkdir build
           cd build
-          cmake -DUSE_SHARED_LIBS= -DSTRICT_GSL_CHECKS=AUDIT -DCI_BUILD=ON -DENABLE_JNI=OFF -DDISABLE_JEMALLOC=ON -DENABLE_AWS=ON -DENABLE_LIBRDKAFKA=ON -DENABLE_MQTT=ON -DENABLE_AZURE=ON -DENABLE_SQL=ON -DENABLE_SPLUNK=ON -DENABLE_GCP=ON -DENABLE_OPC=ON -DENABLE_SCRIPTING=ON -DENABLE_LUA_SCRIPTING=ON -DENABLE_KUBERNETES=ON -DENABLE_TEST_PROCESSORS=ON -DENABLE_PROMETHEUS=ON -DDOCKER_BUILD_ONLY=ON -DDOCKER_CCACHE_DUMP_LOCATION=$HOME/.ccache ..
+          cmake -DUSE_SHARED_LIBS= -DSTRICT_GSL_CHECKS=AUDIT -DCI_BUILD=ON -DDISABLE_JEMALLOC=ON -DENABLE_AWS=ON -DENABLE_LIBRDKAFKA=ON -DENABLE_MQTT=ON -DENABLE_AZURE=ON -DENABLE_SQL=ON \
+              -DENABLE_SPLUNK=ON -DENABLE_GCP=ON -DENABLE_OPC=ON -DENABLE_SCRIPTING=ON -DENABLE_LUA_SCRIPTING=ON -DENABLE_KUBERNETES=ON -DENABLE_TEST_PROCESSORS=ON -DENABLE_PROMETHEUS=ON \
+              -DDOCKER_BUILD_ONLY=ON -DDOCKER_CCACHE_DUMP_LOCATION=$HOME/.ccache ..
           make docker
       - id: install_deps
         run: |
diff --git a/cmake/DockerConfig.cmake b/cmake/DockerConfig.cmake
index 04b9bb92d..dc555fead 100644
--- a/cmake/DockerConfig.cmake
+++ b/cmake/DockerConfig.cmake
@@ -64,6 +64,19 @@ add_custom_target(
         -c DOCKER_SKIP_TESTS=${DOCKER_SKIP_TESTS}
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/docker/)
 
+add_custom_target(
+    centos-test
+    COMMAND ${CMAKE_SOURCE_DIR}/docker/DockerBuild.sh
+        -u 1000
+        -g 1000
+        -v ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}
+        -o ${MINIFI_DOCKER_OPTIONS_STR}
+        -d centos
+        -c BUILD_NUMBER=${BUILD_NUMBER}
+        -c DOCKER_CCACHE_DUMP_LOCATION=${DOCKER_CCACHE_DUMP_LOCATION}
+        -c DOCKER_SKIP_TESTS=OFF
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/docker/)
+
 add_custom_target(
     fedora
     COMMAND ${CMAKE_SOURCE_DIR}/docker/DockerBuild.sh
diff --git a/docker/DockerBuild.sh b/docker/DockerBuild.sh
index 0f53f7f77..14c5efd11 100755
--- a/docker/DockerBuild.sh
+++ b/docker/DockerBuild.sh
@@ -160,10 +160,13 @@ BUILD_ARGS+=("--build-arg" "UID=${UID_ARG}"
             "--build-arg" "DUMP_LOCATION=${DUMP_LOCATION}"
             "--build-arg" "DISTRO_NAME=${DISTRO_NAME}"
             "--build-arg" "DOCKER_SKIP_TESTS=${DOCKER_SKIP_TESTS}")
+if [ -n "${DUMP_LOCATION}" ]; then
+  BUILD_ARGS+=("--build-arg" "DOCKER_MAKE_TARGET=package")
+fi
 
 if [ -n "${DISTRO_NAME}" ]; then
-  echo DOCKER_BUILDKIT=0 docker build "${BUILD_ARGS[@]}" -f "${DOCKERFILE}" -t apacheminificpp:"${TAG}" ..
-  DOCKER_BUILDKIT=0 docker build "${BUILD_ARGS[@]}" -f "${DOCKERFILE}" -t apacheminificpp:"${TAG}" ..
+  echo DOCKER_BUILDKIT=1 docker build "${BUILD_ARGS[@]}" -f "${DOCKERFILE}" -t apacheminificpp:"${TAG}" ..
+  DOCKER_BUILDKIT=1 docker build "${BUILD_ARGS[@]}" -f "${DOCKERFILE}" -t apacheminificpp:"${TAG}" ..
 
   if [ -n "${DOCKER_CCACHE_DUMP_LOCATION}" ]; then
     dump_ccache "apacheminificpp:${TAG}" "${DOCKER_CCACHE_DUMP_LOCATION}"
diff --git a/docker/bionic/Dockerfile b/docker/bionic/Dockerfile
index a715d2afa..41ac52461 100644
--- a/docker/bionic/Dockerfile
+++ b/docker/bionic/Dockerfile
@@ -21,6 +21,7 @@ FROM ubuntu:bionic AS build_deps
 LABEL maintainer="Apache NiFi <de...@nifi.apache.org>"
 
 ARG MINIFI_VERSION
+ARG DOCKER_MAKE_TARGET="all"
 
 # Install the system dependencies needed for a build
 
@@ -50,4 +51,4 @@ RUN cd $MINIFI_BASE_DIR \
     && ./bootstrap.sh -t \
     && cd $MINIFI_BASE_DIR/build \
     && cmake -DSTATIC_BUILD= -DSKIP_TESTS=true ${MINIFI_OPTIONS} -DAWS_ENABLE_UNITY_BUILD=OFF -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" .. \
-    && make -j "$(nproc)" package
+    && make -j "$(nproc)" ${DOCKER_MAKE_TARGET}
diff --git a/docker/centos/Dockerfile b/docker/centos/Dockerfile
index be82d8571..f0e55107b 100644
--- a/docker/centos/Dockerfile
+++ b/docker/centos/Dockerfile
@@ -29,6 +29,7 @@ ARG GID=1000
 ARG MINIFI_OPTIONS=""
 ARG CMAKE_BUILD_TYPE=Release
 ARG DOCKER_SKIP_TESTS=ON
+ARG DOCKER_MAKE_TARGET="all"
 
 # Install the system dependencies needed for a build
 
@@ -36,13 +37,20 @@ ENV MINIFI_BASE_DIR /opt/minifi
 ENV MINIFI_HOME $MINIFI_BASE_DIR/nifi-minifi-cpp-$MINIFI_VERSION
 ENV USER minificpp
 
-# gpsd-devel is in EPEL
-RUN yum -y install epel-release && yum -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel python36-devel sudo git which maven make libarchive boost-devel lua-devel libusbx-devel libpng-devel \
-    gpsd-devel libpcap-devel ccache ca-certificates
-
 RUN mkdir -p $MINIFI_BASE_DIR
 COPY . ${MINIFI_BASE_DIR}
 
+# gpsd-devel and ccache are in EPEL
+RUN yum -y install epel-release && yum -y install sudo git which make libarchive ccache ca-certificates && \
+    if echo "$MINIFI_OPTIONS" | grep -q "ENABLE_GPS=ON"; then yum -y install gpsd-devel; fi && \
+    if echo "$MINIFI_OPTIONS" | grep -q "ENABLE_JNI=ON"; then yum -y install java-1.8.0-openjdk maven; fi && \
+    if echo "$MINIFI_OPTIONS" | grep -q "ENABLE_PCAP=ON"; then yum -y install libpcap-devel; fi && \
+    if echo "$MINIFI_OPTIONS" | grep -q "ENABLE_USB_CAMERA=ON"; then yum -y install libpng-devel libusbx-devel; fi && \
+    if echo "$MINIFI_OPTIONS" | grep -q "ENABLE_OPENCV=ON" || echo "$MINIFI_OPTIONS" | grep -q "ENABLE_BUSTACHE=ON"; then yum -y install boost-devel; fi && \
+    if echo "$MINIFI_OPTIONS" | grep -q "ENABLE_SCRIPTING=ON" && echo "$MINIFI_OPTIONS" | grep -q "ENABLE_LUA_SCRIPTING=ON"; then yum -y install lua-devel; fi && \
+    if echo "$MINIFI_OPTIONS" | grep -q "ENABLE_SCRIPTING=ON" && echo "$MINIFI_OPTIONS" | grep -q "DISABLE_PYTHON_SCRIPTING=OFF"; then yum -y install python36-devel; fi && \
+    if echo "$MINIFI_OPTIONS" | grep -q "ENABLE_SFTP=ON" && [ "${DOCKER_SKIP_TESTS}" == "OFF" ]; then yum -y install java-1.8.0-openjdk maven; fi
+
 RUN cd $MINIFI_BASE_DIR && \
     ./bootstrap.sh -t && \
     ln -s /usr/bin/ccache /usr/lib64/ccache/c++
@@ -60,4 +68,4 @@ RUN cd $MINIFI_BASE_DIR && \
     export PATH=/usr/lib64/ccache${PATH:+:${PATH}} && \
     export CCACHE_DIR=${MINIFI_BASE_DIR}/.ccache && \
     cmake3 -DSTATIC_BUILD= -DSKIP_TESTS=${DOCKER_SKIP_TESTS} ${MINIFI_OPTIONS} -DAWS_ENABLE_UNITY_BUILD=OFF -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" .. && \
-    make -j "$(nproc)" package
+    make -j "$(nproc)" ${DOCKER_MAKE_TARGET}
diff --git a/docker/fedora/Dockerfile b/docker/fedora/Dockerfile
index b6155d034..1f34ba776 100644
--- a/docker/fedora/Dockerfile
+++ b/docker/fedora/Dockerfile
@@ -21,6 +21,7 @@ FROM fedora:34 AS build_deps
 LABEL maintainer="Apache NiFi <de...@nifi.apache.org>"
 
 ARG MINIFI_VERSION
+ARG DOCKER_MAKE_TARGET="all"
 
 # Install the system dependencies needed for a build
 
@@ -51,5 +52,5 @@ RUN cd $MINIFI_BASE_DIR \
 	&& mkdir build \
 	&& cd build \
     && cmake3 -DSTATIC_BUILD= -DSKIP_TESTS=true ${MINIFI_OPTIONS} -DAWS_ENABLE_UNITY_BUILD=OFF -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" .. \
-    && make -j "$(nproc)" package
+    && make -j "$(nproc)" ${DOCKER_MAKE_TARGET}
 
diff --git a/docker/focal/Dockerfile b/docker/focal/Dockerfile
index 77b3ef74d..564c74154 100644
--- a/docker/focal/Dockerfile
+++ b/docker/focal/Dockerfile
@@ -21,6 +21,7 @@ FROM ubuntu:focal AS build_deps
 LABEL maintainer="Apache NiFi <de...@nifi.apache.org>"
 
 ARG MINIFI_VERSION
+ARG DOCKER_MAKE_TARGET="all"
 
 # Install the system dependencies needed for a build
 
@@ -50,4 +51,4 @@ RUN cd $MINIFI_BASE_DIR \
     && ./bootstrap.sh -t \
     && cd $MINIFI_BASE_DIR/build \
     && cmake -DSTATIC_BUILD= -DSKIP_TESTS=true ${MINIFI_OPTIONS} -DAWS_ENABLE_UNITY_BUILD=OFF -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" .. \
-    && make -j "$(nproc)" package
+    && make -j "$(nproc)" ${DOCKER_MAKE_TARGET}


[nifi-minifi-cpp] 04/05: MINIFICPP-2055 Remove C2 metrics from default configuration

Posted by sz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

szaszm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git

commit 0a937973ea4015a1807def1f9f0866f1cfa7146e
Author: Gabor Gyimesi <ga...@gmail.com>
AuthorDate: Fri Mar 3 14:17:37 2023 +0100

    MINIFICPP-2055 Remove C2 metrics from default configuration
    
    Closes #1514
    Signed-off-by: Marton Szasz <sz...@apache.org>
---
 conf/minifi.properties                                 | 18 +++++++++---------
 encrypt-config/tests/resources/minifi.properties       | 18 +++++++++---------
 .../with-additional-sensitive-props.minifi.properties  | 18 +++++++++---------
 libminifi/test/resources/encrypted.minifi.properties   | 18 +++++++++---------
 4 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/conf/minifi.properties b/conf/minifi.properties
index 856de8fb1..884a03f34 100644
--- a/conf/minifi.properties
+++ b/conf/minifi.properties
@@ -92,15 +92,15 @@ nifi.c2.full.heartbeat=false
 #nifi.c2.agent.class=
 #nifi.c2.agent.identifier=
 ## define metrics reported
-nifi.c2.root.class.definitions=metrics
-nifi.c2.root.class.definitions.metrics.name=metrics
-nifi.c2.root.class.definitions.metrics.metrics=runtimemetrics,loadmetrics,processorMetrics
-nifi.c2.root.class.definitions.metrics.metrics.runtimemetrics.name=RuntimeMetrics
-nifi.c2.root.class.definitions.metrics.metrics.runtimemetrics.classes=DeviceInfoNode,FlowInformation
-nifi.c2.root.class.definitions.metrics.metrics.loadmetrics.name=LoadMetrics
-nifi.c2.root.class.definitions.metrics.metrics.loadmetrics.classes=QueueMetrics,RepositoryMetrics
-nifi.c2.root.class.definitions.metrics.metrics.processorMetrics.name=ProcessorMetric
-nifi.c2.root.class.definitions.metrics.metrics.processorMetrics.classes=GetFileMetrics
+# nifi.c2.root.class.definitions=metrics
+# nifi.c2.root.class.definitions.metrics.name=metrics
+# nifi.c2.root.class.definitions.metrics.metrics=runtimemetrics,loadmetrics,processorMetrics
+# nifi.c2.root.class.definitions.metrics.metrics.runtimemetrics.name=RuntimeMetrics
+# nifi.c2.root.class.definitions.metrics.metrics.runtimemetrics.classes=DeviceInfoNode,FlowInformation
+# nifi.c2.root.class.definitions.metrics.metrics.loadmetrics.name=LoadMetrics
+# nifi.c2.root.class.definitions.metrics.metrics.loadmetrics.classes=QueueMetrics,RepositoryMetrics
+# nifi.c2.root.class.definitions.metrics.metrics.processorMetrics.name=ProcessorMetric
+# nifi.c2.root.class.definitions.metrics.metrics.processorMetrics.classes=GetFileMetrics
 
 ## Specify multiple heartbeat handlers.
 ## HeartbeatLogger logs the heartbeats on TRACE for debugging.
diff --git a/encrypt-config/tests/resources/minifi.properties b/encrypt-config/tests/resources/minifi.properties
index eb572a2bd..b2f3a2eca 100644
--- a/encrypt-config/tests/resources/minifi.properties
+++ b/encrypt-config/tests/resources/minifi.properties
@@ -72,15 +72,15 @@ nifi.c2.agent.class=EncryptConfigTester
 nifi.c2.agent.identifier=EncryptConfigTester-001
 
 ## define metrics reported
-nifi.c2.root.class.definitions=metrics
-nifi.c2.root.class.definitions.metrics.name=metrics
-nifi.c2.root.class.definitions.metrics.metrics=runtimemetrics,loadmetrics,processorMetrics
-nifi.c2.root.class.definitions.metrics.metrics.runtimemetrics.name=RuntimeMetrics
-nifi.c2.root.class.definitions.metrics.metrics.runtimemetrics.classes=DeviceInfoNode,FlowInformation
-nifi.c2.root.class.definitions.metrics.metrics.loadmetrics.name=LoadMetrics
-nifi.c2.root.class.definitions.metrics.metrics.loadmetrics.classes=QueueMetrics,RepositoryMetrics
-nifi.c2.root.class.definitions.metrics.metrics.processorMetrics.name=ProcessorMetric
-nifi.c2.root.class.definitions.metrics.metrics.processorMetrics.classes=GetFileMetrics
+# nifi.c2.root.class.definitions=metrics
+# nifi.c2.root.class.definitions.metrics.name=metrics
+# nifi.c2.root.class.definitions.metrics.metrics=runtimemetrics,loadmetrics,processorMetrics
+# nifi.c2.root.class.definitions.metrics.metrics.runtimemetrics.name=RuntimeMetrics
+# nifi.c2.root.class.definitions.metrics.metrics.runtimemetrics.classes=DeviceInfoNode,FlowInformation
+# nifi.c2.root.class.definitions.metrics.metrics.loadmetrics.name=LoadMetrics
+# nifi.c2.root.class.definitions.metrics.metrics.loadmetrics.classes=QueueMetrics,RepositoryMetrics
+# nifi.c2.root.class.definitions.metrics.metrics.processorMetrics.name=ProcessorMetric
+# nifi.c2.root.class.definitions.metrics.metrics.processorMetrics.classes=GetFileMetrics
 
 ## enable the controller socket provider on port 9998
 ## off by default. C2 must be enabled to support these
diff --git a/encrypt-config/tests/resources/with-additional-sensitive-props.minifi.properties b/encrypt-config/tests/resources/with-additional-sensitive-props.minifi.properties
index d584d8089..dc4509121 100644
--- a/encrypt-config/tests/resources/with-additional-sensitive-props.minifi.properties
+++ b/encrypt-config/tests/resources/with-additional-sensitive-props.minifi.properties
@@ -74,15 +74,15 @@ nifi.c2.agent.class=EncryptConfigTester
 nifi.c2.agent.identifier=EncryptConfigTester-001
 
 ## define metrics reported
-nifi.c2.root.class.definitions=metrics
-nifi.c2.root.class.definitions.metrics.name=metrics
-nifi.c2.root.class.definitions.metrics.metrics=runtimemetrics,loadmetrics,processorMetrics
-nifi.c2.root.class.definitions.metrics.metrics.runtimemetrics.name=RuntimeMetrics
-nifi.c2.root.class.definitions.metrics.metrics.runtimemetrics.classes=DeviceInfoNode,FlowInformation
-nifi.c2.root.class.definitions.metrics.metrics.loadmetrics.name=LoadMetrics
-nifi.c2.root.class.definitions.metrics.metrics.loadmetrics.classes=QueueMetrics,RepositoryMetrics
-nifi.c2.root.class.definitions.metrics.metrics.processorMetrics.name=ProcessorMetric
-nifi.c2.root.class.definitions.metrics.metrics.processorMetrics.classes=GetFileMetrics
+# nifi.c2.root.class.definitions=metrics
+# nifi.c2.root.class.definitions.metrics.name=metrics
+# nifi.c2.root.class.definitions.metrics.metrics=runtimemetrics,loadmetrics,processorMetrics
+# nifi.c2.root.class.definitions.metrics.metrics.runtimemetrics.name=RuntimeMetrics
+# nifi.c2.root.class.definitions.metrics.metrics.runtimemetrics.classes=DeviceInfoNode,FlowInformation
+# nifi.c2.root.class.definitions.metrics.metrics.loadmetrics.name=LoadMetrics
+# nifi.c2.root.class.definitions.metrics.metrics.loadmetrics.classes=QueueMetrics,RepositoryMetrics
+# nifi.c2.root.class.definitions.metrics.metrics.processorMetrics.name=ProcessorMetric
+# nifi.c2.root.class.definitions.metrics.metrics.processorMetrics.classes=GetFileMetrics
 
 ## enable the controller socket provider on port 9998
 ## off by default. C2 must be enabled to support these
diff --git a/libminifi/test/resources/encrypted.minifi.properties b/libminifi/test/resources/encrypted.minifi.properties
index 49e25e0fa..bbf1fb62d 100644
--- a/libminifi/test/resources/encrypted.minifi.properties
+++ b/libminifi/test/resources/encrypted.minifi.properties
@@ -75,15 +75,15 @@ c2.agent.identifier=lZL2phnmPWP4s7k8LzzONTNh/2Nhgyty||OLyo7FtKOZ5M1DbiVCEMrlch8D
 c2.agent.identifier.protected=xsalsa20poly1305
 
 ## define metrics reported
-nifi.c2.root.class.definitions=metrics
-nifi.c2.root.class.definitions.metrics.name=metrics
-nifi.c2.root.class.definitions.metrics.metrics=runtimemetrics,loadmetrics,processorMetrics
-nifi.c2.root.class.definitions.metrics.metrics.runtimemetrics.name=RuntimeMetrics
-nifi.c2.root.class.definitions.metrics.metrics.runtimemetrics.classes=DeviceInfoNode,FlowInformation
-nifi.c2.root.class.definitions.metrics.metrics.loadmetrics.name=LoadMetrics
-nifi.c2.root.class.definitions.metrics.metrics.loadmetrics.classes=QueueMetrics,RepositoryMetrics
-nifi.c2.root.class.definitions.metrics.metrics.processorMetrics.name=ProcessorMetric
-nifi.c2.root.class.definitions.metrics.metrics.processorMetrics.classes=GetFileMetrics
+# nifi.c2.root.class.definitions=metrics
+# nifi.c2.root.class.definitions.metrics.name=metrics
+# nifi.c2.root.class.definitions.metrics.metrics=runtimemetrics,loadmetrics,processorMetrics
+# nifi.c2.root.class.definitions.metrics.metrics.runtimemetrics.name=RuntimeMetrics
+# nifi.c2.root.class.definitions.metrics.metrics.runtimemetrics.classes=DeviceInfoNode,FlowInformation
+# nifi.c2.root.class.definitions.metrics.metrics.loadmetrics.name=LoadMetrics
+# nifi.c2.root.class.definitions.metrics.metrics.loadmetrics.classes=QueueMetrics,RepositoryMetrics
+# nifi.c2.root.class.definitions.metrics.metrics.processorMetrics.name=ProcessorMetric
+# nifi.c2.root.class.definitions.metrics.metrics.processorMetrics.classes=GetFileMetrics
 
 ## enable the controller socket provider on port 9998
 ## off by default. C2 must be enabled to support these


[nifi-minifi-cpp] 05/05: MINIFICPP-2061 reverseDnsLookup shouldn't throw on timeout

Posted by sz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

szaszm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git

commit 32043f51faeedbae9ab4a64eca52907f696529a9
Author: Martin Zink <ma...@apache.org>
AuthorDate: Fri Mar 3 14:18:38 2023 +0100

    MINIFICPP-2061 reverseDnsLookup shouldn't throw on timeout
    
    Closes #1520
    Signed-off-by: Marton Szasz <sz...@apache.org>
---
 extensions/expression-language/Expression.cpp         | 10 +++++++++-
 .../tests/ExpressionLanguageTests.cpp                 | 19 ++++++++++++++-----
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/extensions/expression-language/Expression.cpp b/extensions/expression-language/Expression.cpp
index f1570775c..5bb59506d 100644
--- a/extensions/expression-language/Expression.cpp
+++ b/extensions/expression-language/Expression.cpp
@@ -63,6 +63,8 @@
 
 #include "Driver.h"
 
+#include "core/logging/LoggerFactory.h"
+
 #include "date/tz.h"
 #include "utils/net/DNS.h"
 #include "utils/expected.h"
@@ -198,7 +200,13 @@ Value expr_reverseDnsLookup(const std::vector<Value>& args) {
   return utils::net::addressFromString(ip_address_str)
       | utils::flatMap([timeout_duration](const auto& ip_address) { return utils::net::reverseDnsLookup(ip_address, timeout_duration);})
       | utils::map([](const auto& hostname)-> Value { return Value(hostname); })
-      | utils::valueOrElse([&](std::error_code error_code) { throw std::system_error(error_code);});
+      | utils::valueOrElse([&](std::error_code error_code) {
+        if (error_code.value() == asio::error::timed_out) {
+          core::logging::LoggerFactory<Expression>::getLogger()->log_warn("reverseDnsLookup timed out");
+          return Value(ip_address_str);
+        }
+        throw std::system_error(error_code);
+      });
 }
 
 Value expr_uuid(const std::vector<Value>& /*args*/) {
diff --git a/extensions/expression-language/tests/ExpressionLanguageTests.cpp b/extensions/expression-language/tests/ExpressionLanguageTests.cpp
index 477000981..a1be75a49 100644
--- a/extensions/expression-language/tests/ExpressionLanguageTests.cpp
+++ b/extensions/expression-language/tests/ExpressionLanguageTests.cpp
@@ -1333,15 +1333,24 @@ TEST_CASE("Reverse DNS lookup with invalid timeout parameter", "[ExpressionLangu
 }
 
 TEST_CASE("Reverse DNS lookup with valid timeout parameter", "[ExpressionLanguage][reverseDnsLookup]") {
-  auto reverse_lookup_expr_500ms = expression::compile("${reverseDnsLookup(${ip_addr}, 500)}");
-  auto reverse_lookup_expr_0ms = expression::compile("${reverseDnsLookup(${ip_addr}, 0)}");  // 0ms to make sure it times out
+  LogTestController::getInstance().setWarn<expression::Expression>();
+  LogTestController::getInstance().clear();
 
   auto flow_file_a = std::make_shared<core::FlowFile>();
   std::string expected_hostname;
-  flow_file_a->addAttribute("ip_addr", "192.0.2.1");
+  flow_file_a->addAttribute("ip_addr", "8.8.8.8");
+
+  SECTION("Should timeout") {
+    auto reverse_lookup_expr_0ms = expression::compile("${reverseDnsLookup(${ip_addr}, 0)}");
+    REQUIRE_NOTHROW(reverse_lookup_expr_0ms(expression::Parameters{flow_file_a}).asString() == "8.8.8.8");
+    CHECK(LogTestController::getInstance().contains("reverseDnsLookup timed out", 0ms));
+  }
 
-  REQUIRE_THROWS_AS(reverse_lookup_expr_0ms(expression::Parameters{flow_file_a}), std::runtime_error);
-  REQUIRE_NOTHROW(reverse_lookup_expr_500ms(expression::Parameters{ flow_file_a }));
+  SECTION("Shouldn't timeout") {
+    auto reverse_lookup_expr_500ms = expression::compile("${reverseDnsLookup(${ip_addr}, 500)}");
+    REQUIRE_NOTHROW(reverse_lookup_expr_500ms(expression::Parameters{flow_file_a}).asString() == "dns.google");
+    CHECK_FALSE(LogTestController::getInstance().contains("reverseDnsLookup timed out", 0ms));
+  }
 }
 
 TEST_CASE("UUID", "[expressionUuid]") {


[nifi-minifi-cpp] 01/05: MINIFICPP-2041 Fix transient failure of HttpPostIntegrationTestChunked

Posted by sz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

szaszm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git

commit 9c5e2996b3e8cb7fb4aadf9c29bf6970af6fa618
Author: Gabor Gyimesi <ga...@gmail.com>
AuthorDate: Fri Mar 3 14:12:32 2023 +0100

    MINIFICPP-2041 Fix transient failure of HttpPostIntegrationTestChunked
    
    There was a concurrency issue between the test logger on one thread and
    the verifying thread which read the output stream of the logger. Adding
    a mutex that guards ostringstream and the logger sink that writes
    ostringstream solves this issue.
    
    Closes #1512
    Signed-off-by: Marton Szasz <sz...@apache.org>
---
 extensions/civetweb/processors/ListenHTTP.cpp      |  1 +
 .../tests/C2ClearCoreComponentStateTest.cpp        |  2 +-
 extensions/http-curl/tests/C2LogHeartbeatTest.cpp  |  2 +-
 .../http-curl/tests/HttpPostIntegrationTest.cpp    |  2 +-
 extensions/sftp/tests/ListSFTPTests.cpp            | 42 +++++++++---------
 .../tests/unit/ListFileTests.cpp                   |  2 +-
 .../tests/unit/RetryFlowFileTests.cpp              |  4 +-
 .../tests/unit/TailFileTests.cpp                   | 50 +++++++++++-----------
 extensions/windows-event-log/tests/CWELTestUtils.h |  2 +-
 .../tests/ConsumeWindowsEventLogTests.cpp          | 14 +++---
 libminifi/include/utils/IntegrationTestUtils.h     |  2 +-
 libminifi/test/LogUtils.h                          | 12 +++++-
 libminifi/test/TestBase.cpp                        | 21 ++++++---
 libminifi/test/TestBase.h                          | 15 ++++---
 .../test/azure-tests/ListAzureBlobStorageTests.cpp |  4 +-
 .../azure-tests/ListAzureDataLakeStorageTests.cpp  |  4 +-
 .../integration/OnScheduleErrorHandlingTests.cpp   |  8 ++--
 .../integration/StateTransactionalityTests.cpp     |  6 +--
 18 files changed, 109 insertions(+), 84 deletions(-)

diff --git a/extensions/civetweb/processors/ListenHTTP.cpp b/extensions/civetweb/processors/ListenHTTP.cpp
index 127ac332a..02e8d543e 100644
--- a/extensions/civetweb/processors/ListenHTTP.cpp
+++ b/extensions/civetweb/processors/ListenHTTP.cpp
@@ -262,6 +262,7 @@ bool ListenHTTP::processIncomingFlowFile(core::ProcessSession &session) {
 
 /// @return Whether there was a request processed
 bool ListenHTTP::processRequestBuffer(core::ProcessSession& session) {
+  gsl_Expects(handler_);
   std::size_t flow_file_count = 0;
   for (; batch_size_ == 0 || batch_size_ > flow_file_count; ++flow_file_count) {
     FlowFileBufferPair flow_file_buffer_pair;
diff --git a/extensions/http-curl/tests/C2ClearCoreComponentStateTest.cpp b/extensions/http-curl/tests/C2ClearCoreComponentStateTest.cpp
index ebdfd3e20..181a0f28a 100644
--- a/extensions/http-curl/tests/C2ClearCoreComponentStateTest.cpp
+++ b/extensions/http-curl/tests/C2ClearCoreComponentStateTest.cpp
@@ -137,7 +137,7 @@ class ClearCoreComponentStateHandler: public HeartbeatHandler {
       }
       case FlowState::CLEAR_SENT: {
         auto tail_file_ran_again_checker = [this] {
-          const auto log_contents = LogTestController::getInstance().log_output.str();
+          const auto log_contents = LogTestController::getInstance().getLogs();
           const std::string tailing_file_pattern = "[debug] Tailing file " + file_1_location_.string();
           const std::string tail_file_committed_pattern = "[trace] ProcessSession committed for TailFile1";
           const std::vector<std::string> patterns = {tailing_file_pattern, tailing_file_pattern, tail_file_committed_pattern};
diff --git a/extensions/http-curl/tests/C2LogHeartbeatTest.cpp b/extensions/http-curl/tests/C2LogHeartbeatTest.cpp
index 624185d70..1e50c7e54 100644
--- a/extensions/http-curl/tests/C2LogHeartbeatTest.cpp
+++ b/extensions/http-curl/tests/C2LogHeartbeatTest.cpp
@@ -54,7 +54,7 @@ class VerifyLogC2Heartbeat : public VerifyC2Base {
         std::chrono::milliseconds(wait_time_),
         "\"operation\": \"heartbeat\""));
 
-    const auto log = LogTestController::getInstance().log_output.str();
+    const auto log = LogTestController::getInstance().getLogs();
     auto types_in_heartbeat = log | ranges::views::split('\n')
         | ranges::views::transform([](auto&& rng) { return rng | ranges::to<std::string>; })
         | ranges::views::filter([](auto&& line) { return utils::StringUtils::startsWith(line, "                                \"type\":"); })
diff --git a/extensions/http-curl/tests/HttpPostIntegrationTest.cpp b/extensions/http-curl/tests/HttpPostIntegrationTest.cpp
index d4271a3e9..dfd6d3d18 100644
--- a/extensions/http-curl/tests/HttpPostIntegrationTest.cpp
+++ b/extensions/http-curl/tests/HttpPostIntegrationTest.cpp
@@ -37,7 +37,7 @@ using namespace std::literals::chrono_literals;
 
 class HttpTestHarness : public HTTPIntegrationBase {
  public:
-  HttpTestHarness() : HTTPIntegrationBase(4s) {
+  HttpTestHarness() {
     dir_ = test_controller_.createTempDirectory();
   }
 
diff --git a/extensions/sftp/tests/ListSFTPTests.cpp b/extensions/sftp/tests/ListSFTPTests.cpp
index 68faaab04..6a993a2db 100644
--- a/extensions/sftp/tests/ListSFTPTests.cpp
+++ b/extensions/sftp/tests/ListSFTPTests.cpp
@@ -416,7 +416,7 @@ TEST_CASE_METHOD(ListSFTPTestsFixture, "ListSFTP Tracking Timestamps one file",
   REQUIRE(LogTestController::getInstance().contains("key:filename value:tstFile.ext"));
 
   plan->reset();
-  LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
 
   testController.runSession(plan, true);
 
@@ -435,7 +435,7 @@ TEST_CASE_METHOD(ListSFTPTestsFixture, "ListSFTP Tracking Timestamps one file on
   REQUIRE(LogTestController::getInstance().contains("key:filename value:file1.ext"));
 
   plan->reset();
-  LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
 
   createFileWithModificationTimeDiff("nifi_test/file2.ext", "Test content 2", -4min);
 
@@ -456,7 +456,7 @@ TEST_CASE_METHOD(ListSFTPTestsFixture, "ListSFTP Tracking Timestamps one file on
   REQUIRE(LogTestController::getInstance().contains("key:filename value:file1.ext"));
 
   plan->reset();
-  LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
 
   createFileWithModificationTimeDiff("nifi_test/file2.ext", "Test content 2", -6min);
 
@@ -479,7 +479,7 @@ TEST_CASE_METHOD(ListSFTPTestsFixture, "ListSFTP Tracking Timestamps one file an
   REQUIRE(LogTestController::getInstance().contains("key:filename value:file1.ext"));
 
   plan->reset();
-  LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
 
   /* We must sleep to avoid triggering the listing lag. */
   std::this_thread::sleep_for(std::chrono::milliseconds(1500));
@@ -506,7 +506,7 @@ TEST_CASE_METHOD(ListSFTPTestsFixture, "ListSFTP Tracking Timestamps one file ti
   REQUIRE(LogTestController::getInstance().contains("key:filename value:file1.ext"));
 
   plan->reset();
-  LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
 
   REQUIRE(utils::file::set_last_write_time(file, mtime + 1s));
 
@@ -516,7 +516,7 @@ TEST_CASE_METHOD(ListSFTPTestsFixture, "ListSFTP Tracking Timestamps one file ti
   REQUIRE(LogTestController::getInstance().contains("key:filename value:file1.ext"));
 
   plan->reset();
-  LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
 
   /* We must sleep to avoid triggering the listing lag. */
   std::this_thread::sleep_for(std::chrono::milliseconds(1500));
@@ -551,7 +551,7 @@ TEST_CASE_METHOD(PersistentListSFTPTestsFixture, "ListSFTP Tracking Timestamps r
   REQUIRE(list_sftp_uuid);
   createPlan(&list_sftp_uuid, std::make_shared<minifi::Configure>());
   plan->setProperty(list_sftp, "Listing Strategy", "Tracking Timestamps");
-  LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
 
   createFileWithModificationTimeDiff("nifi_test/file2.ext", "Test content 2", -4min);
 
@@ -594,7 +594,7 @@ TEST_CASE_METHOD(PersistentListSFTPTestsFixture, "ListSFTP Tracking Timestamps r
   createPlan(&list_sftp_uuid, std::make_shared<minifi::Configure>());
   plan->setProperty(list_sftp, "Listing Strategy", "Tracking Timestamps");
   plan->setProperty(list_sftp, "Remote Path", "/nifi_test");
-  LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
 
   createFileWithModificationTimeDiff("nifi_test/file2.ext", "Test content 2", -4min);
 
@@ -627,7 +627,7 @@ TEST_CASE_METHOD(ListSFTPTestsFixture, "ListSFTP Tracking Timestamps changed con
   REQUIRE(LogTestController::getInstance().contains("key:filename value:file1.ext"));
 
   plan->reset();
-  LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
   plan->setProperty(list_sftp, "Remote Path", "/nifi_test");
 
   createFileWithModificationTimeDiff("nifi_test/file2.ext", "Test content 2", -4min);
@@ -655,7 +655,7 @@ TEST_CASE_METHOD(ListSFTPTestsFixture, "ListSFTP Tracking Entities one file", "[
   REQUIRE(LogTestController::getInstance().contains("key:filename value:tstFile.ext"));
 
   plan->reset();
-  LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
 
   testController.runSession(plan, true);
 
@@ -674,7 +674,7 @@ TEST_CASE_METHOD(ListSFTPTestsFixture, "ListSFTP Tracking Entities one file one
   REQUIRE(LogTestController::getInstance().contains("key:filename value:file1.ext"));
 
   plan->reset();
-  LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
 
   createFileWithModificationTimeDiff("nifi_test/file2.ext", "Test content 2", -4min);
 
@@ -695,7 +695,7 @@ TEST_CASE_METHOD(ListSFTPTestsFixture, "ListSFTP Tracking Entities one file one
   REQUIRE(LogTestController::getInstance().contains("key:filename value:file1.ext"));
 
   plan->reset();
-  LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
 
   createFileWithModificationTimeDiff("nifi_test/file2.ext", "Test content 2", -6min);
 
@@ -718,7 +718,7 @@ TEST_CASE_METHOD(ListSFTPTestsFixture, "ListSFTP Tracking Entities one file one
   REQUIRE(LogTestController::getInstance().contains("key:filename value:file1.ext"));
 
   plan->reset();
-  LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
 
   createFileWithModificationTimeDiff("nifi_test/file2.ext", "Test content 2", -6h);
 
@@ -741,7 +741,7 @@ TEST_CASE_METHOD(ListSFTPTestsFixture, "ListSFTP Tracking Entities one file anot
   REQUIRE(LogTestController::getInstance().contains("key:filename value:file1.ext"));
 
   plan->reset();
-  LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
 
   createFile("nifi_test/file2.ext", "Test content 2", mtime);
 
@@ -767,7 +767,7 @@ TEST_CASE_METHOD(ListSFTPTestsFixture, "ListSFTP Tracking Entities one file time
   REQUIRE(LogTestController::getInstance().contains("key:filename value:file1.ext"));
 
   plan->reset();
-  LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
 
   REQUIRE(utils::file::set_last_write_time(file, mtime + 1s));
 
@@ -778,7 +778,7 @@ TEST_CASE_METHOD(ListSFTPTestsFixture, "ListSFTP Tracking Entities one file time
   REQUIRE(LogTestController::getInstance().contains("key:filename value:file1.ext"));
 
   plan->reset();
-  LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
 
   testController.runSession(plan, true);
 
@@ -799,7 +799,7 @@ TEST_CASE_METHOD(ListSFTPTestsFixture, "ListSFTP Tracking Entities one file size
   REQUIRE(LogTestController::getInstance().contains("key:filename value:file1.ext"));
 
   plan->reset();
-  LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
 
   createFile("nifi_test/file1.ext", "Longer test content 1", mtime);
 
@@ -810,7 +810,7 @@ TEST_CASE_METHOD(ListSFTPTestsFixture, "ListSFTP Tracking Entities one file size
   REQUIRE(LogTestController::getInstance().contains("key:filename value:file1.ext"));
 
   plan->reset();
-  LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
 
   testController.runSession(plan, true);
 
@@ -832,7 +832,7 @@ TEST_CASE_METHOD(PersistentListSFTPTestsFixture, "ListSFTP Tracking Entities res
   REQUIRE(list_sftp_uuid);
   createPlan(&list_sftp_uuid, std::make_shared<minifi::Configure>());
   plan->setProperty(list_sftp, "Listing Strategy", "Tracking Entities");
-  LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
 
   std::unordered_map<std::string, std::string> state;
   REQUIRE(plan->getProcessContextForProcessor(list_sftp)->getStateManager()->get(state));
@@ -893,7 +893,7 @@ TEST_CASE_METHOD(PersistentListSFTPTestsFixture, "ListSFTP Tracking Entities res
   createPlan(&list_sftp_uuid, std::make_shared<minifi::Configure>());
   plan->setProperty(list_sftp, "Listing Strategy", "Tracking Entities");
   plan->setProperty(list_sftp, "Remote Path", "/nifi_test");
-  LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
 
   createFileWithModificationTimeDiff("nifi_test/file2.ext", "Test content 2", -4min);
 
@@ -926,7 +926,7 @@ TEST_CASE_METHOD(ListSFTPTestsFixture, "ListSFTP Tracking Entities changed confi
   REQUIRE(LogTestController::getInstance().contains("key:filename value:file1.ext"));
 
   plan->reset();
-  LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
   plan->setProperty(list_sftp, "Remote Path", "/nifi_test");
 
   createFileWithModificationTimeDiff("nifi_test/file2.ext", "Test content 2", -4min);
diff --git a/extensions/standard-processors/tests/unit/ListFileTests.cpp b/extensions/standard-processors/tests/unit/ListFileTests.cpp
index 46ce99b47..32172c05f 100644
--- a/extensions/standard-processors/tests/unit/ListFileTests.cpp
+++ b/extensions/standard-processors/tests/unit/ListFileTests.cpp
@@ -140,7 +140,7 @@ TEST_CASE_METHOD(ListFileTestFixture, "Test listing files only once with default
   REQUIRE(verifyLogLinePresenceInPollTime(3s, "key:file.lastModifiedTime value:" + *utils::file::FileUtils::get_last_modified_time_formatted_string(first_sub_file_abs_path_, FORMAT_STRING)));
   REQUIRE(verifyLogLinePresenceInPollTime(3s, "key:file.lastModifiedTime value:" + *utils::file::FileUtils::get_last_modified_time_formatted_string(second_sub_file_abs_path_, FORMAT_STRING)));
   plan_->reset();
-  LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
   test_controller_.runSession(plan_, true);
   REQUIRE_FALSE(LogTestController::getInstance().contains("key:file.size", 0s, 0ms));
 }
diff --git a/extensions/standard-processors/tests/unit/RetryFlowFileTests.cpp b/extensions/standard-processors/tests/unit/RetryFlowFileTests.cpp
index daf2f1abe..9dfd3f53c 100644
--- a/extensions/standard-processors/tests/unit/RetryFlowFileTests.cpp
+++ b/extensions/standard-processors/tests/unit/RetryFlowFileTests.cpp
@@ -163,13 +163,13 @@ class RetryFlowFileTest {
   }
 
   static bool logContainsText(const std::string& pattern) {
-    const std::string logs = LogTestController::getInstance().log_output.str();
+    const std::string logs = LogTestController::getInstance().getLogs();
     return logs.find(pattern) != std::string::npos;
   }
 
   static bool flowfileWasPenalizedARetryflowfile() {
     std::regex re(R"(\[org::apache::nifi::minifi::core::ProcessSession\] \[info\] Penalizing [0-9a-z\-]+ for [0-9]*ms at retryflowfile)");
-    return std::regex_search(LogTestController::getInstance().log_output.str(), re);
+    return std::regex_search(LogTestController::getInstance().getLogs(), re);
   }
 
   static bool retryFlowfileWarnedForReuse() {
diff --git a/extensions/standard-processors/tests/unit/TailFileTests.cpp b/extensions/standard-processors/tests/unit/TailFileTests.cpp
index fd82b81c9..dd295a9ef 100644
--- a/extensions/standard-processors/tests/unit/TailFileTests.cpp
+++ b/extensions/standard-processors/tests/unit/TailFileTests.cpp
@@ -140,7 +140,7 @@ TEST_CASE("TailFile picks up the second line if a delimiter is written between r
   REQUIRE(LogTestController::getInstance().contains("key:filename value:minifi-tmpfile.0-13.txt"));
 
   plan->reset(true);  // start a new but with state file
-  LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
 
   std::ofstream appendStream;
   appendStream.open(temp_file_path, std::ios_base::app | std::ios_base::binary);
@@ -182,7 +182,7 @@ TEST_CASE("TailFile re-reads the file if the state is deleted between runs", "[s
   REQUIRE(LogTestController::getInstance().contains("key:filename value:minifi-tmpfile.0-13.txt"));
 
   plan->reset(true);  // start a new but with state file
-  LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
 
   plan->getProcessContextForProcessor(tailfile)->getStateManager()->clear();
 
@@ -230,7 +230,7 @@ TEST_CASE("TailFile picks up the state correctly if it is rewritten between runs
   // should stay the same
   for (int i = 0; i < 5; i++) {
     plan->reset(true);  // start a new but with state file
-    LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+    LogTestController::getInstance().clear();
 
     plan->getProcessContextForProcessor(tailfile)->getStateManager()->set({{"file.0.name", temp_file_path.filename().string()},
                                                                                    {"file.0.position", "14"},
@@ -392,7 +392,7 @@ TEST_CASE("TailFile picks up the new File to Tail if it is changed between runs"
     auto second_test_file = createTempFile(directory, "second.log", "my second log line\n");
     plan->setProperty(tail_file, org::apache::nifi::minifi::processors::TailFile::FileName.getName(), second_test_file.string());
     plan->reset(true);  // clear the memory, but keep the state file
-    LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+    LogTestController::getInstance().clear();
     testController.runSession(plan, true);
     REQUIRE(LogTestController::getInstance().contains("Logged 1 flow file"));
     REQUIRE(LogTestController::getInstance().contains("key:filename value:second.0-18.log"));
@@ -403,7 +403,7 @@ TEST_CASE("TailFile picks up the new File to Tail if it is changed between runs"
     auto second_test_file = createTempFile(directory, "second.log", "");
     plan->setProperty(tail_file, org::apache::nifi::minifi::processors::TailFile::FileName.getName(), second_test_file.string());
     plan->reset(true);  // clear the memory, but keep the state file
-    LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+    LogTestController::getInstance().clear();
     testController.runSession(plan, true);
     REQUIRE(LogTestController::getInstance().contains("Logged 0 flow files"));
   }
@@ -441,7 +441,7 @@ TEST_CASE("TailFile picks up the new File to Tail if it is changed between runs
   SECTION("If a file no longer matches the new regex, then we stop tailing it") {
     plan->setProperty(tail_file, org::apache::nifi::minifi::processors::TailFile::FileName.getName(), "first\\.f.*\\.log");
     plan->reset(true);  // clear the memory, but keep the state file
-    LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+    LogTestController::getInstance().clear();
     testController.runSession(plan, true);
     REQUIRE(LogTestController::getInstance().contains("Logged 1 flow file"));
     REQUIRE(LogTestController::getInstance().contains("key:filename value:first.fruit.6-12.log"));
@@ -450,7 +450,7 @@ TEST_CASE("TailFile picks up the new File to Tail if it is changed between runs
   SECTION("If a new file matches the new regex, we start tailing it") {
     plan->setProperty(tail_file, org::apache::nifi::minifi::processors::TailFile::FileName.getName(), ".*\\.fruit\\.log");
     plan->reset(true);  // clear the memory, but keep the state file
-    LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+    LogTestController::getInstance().clear();
     testController.runSession(plan, true);
     REQUIRE(LogTestController::getInstance().contains("Logged 2 flow file"));
     REQUIRE(LogTestController::getInstance().contains("key:filename value:first.fruit.6-12.log"));
@@ -527,7 +527,7 @@ TEST_CASE("TailFile picks up new files created between runs", "[multiple_file]")
   createTempFile(dir, "another.log", "some more content\n");
 
   plan->reset();
-  LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
 
   testController.runSession(plan, true);
   REQUIRE(LogTestController::getInstance().contains("Logged 1 flow file"));
@@ -563,7 +563,7 @@ TEST_CASE("TailFile can handle input files getting removed", "[multiple_file]")
   REQUIRE(LogTestController::getInstance().contains("Logged 2 flow files"));
 
   plan->reset();
-  LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
 
   appendTempFile(dir, "one.log", "line two\nline three\nline four\n");
   std::filesystem::remove(dir / "two.log");
@@ -830,7 +830,7 @@ TEST_CASE("TailFile finds and finishes the renamed file and continues with the n
   new_in_file_stream.close();
 
   plan->reset();
-  LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
 
   plan->runNextProcessor();  // Tail
   plan->runNextProcessor();  // Log
@@ -891,7 +891,7 @@ TEST_CASE("TailFile finds and finishes multiple rotated files and continues with
   test_file_stream_2.close();
 
   plan->reset();
-  LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
 
   testController.runSession(plan, true);
 
@@ -936,7 +936,7 @@ TEST_CASE("TailFile ignores old rotated files", "[rotation]") {
   createTempFile(dir, "test.log", "line8\nline9\n");
 
   plan->reset();
-  LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
 
   testController.runSession(plan, true);
   REQUIRE(LogTestController::getInstance().contains("Logged 2 flow files"));
@@ -996,7 +996,7 @@ TEST_CASE("TailFile rotation works with multiple input files", "[rotation][multi
   appendTempFile(dir, "color.log", "turquoise\n");
 
   plan->reset();
-  LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
 
   testController.runSession(plan, true);
 
@@ -1063,7 +1063,7 @@ TEST_CASE("TailFile handles the Rolling Filename Pattern property correctly", "[
   createTempFile(dir, "other_rolled.log", "some stuff\none more line\n");  // same contents as test.rolled.log
 
   plan->reset();
-  LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
 
   testController.runSession(plan, true);
 
@@ -1104,7 +1104,7 @@ TEST_CASE("TailFile finds and finishes the renamed file and continues with the n
     REQUIRE(LogTestController::getInstance().contains("Logged 3 flow files"));
   }
 
-  LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
 
   std::this_thread::sleep_for(std::chrono::milliseconds(100));
 
@@ -1466,7 +1466,7 @@ TEST_CASE("TailFile interprets the lookup frequency property correctly", "[multi
     REQUIRE(LogTestController::getInstance().contains("Logged 1 flow files"));
 
     plan->reset();
-    LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+    LogTestController::getInstance().clear();
 
     createTempFile(directory, "test.blue.log", "sky\n");
     createTempFile(directory, "test.green.log", "grass\n");
@@ -1482,7 +1482,7 @@ TEST_CASE("TailFile interprets the lookup frequency property correctly", "[multi
     REQUIRE(LogTestController::getInstance().contains("Logged 1 flow files"));
 
     plan->reset();
-    LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+    LogTestController::getInstance().clear();
 
     createTempFile(directory, "test.blue.log", "sky\n");
     createTempFile(directory, "test.green.log", "grass\n");
@@ -1491,7 +1491,7 @@ TEST_CASE("TailFile interprets the lookup frequency property correctly", "[multi
     REQUIRE(LogTestController::getInstance().contains("Logged 0 flow files"));
 
     plan->reset();
-    LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+    LogTestController::getInstance().clear();
 
     std::this_thread::sleep_for(std::chrono::milliseconds(550));
     testController.runSession(plan, true);
@@ -1531,7 +1531,7 @@ TEST_CASE("TailFile reads from a single file when Initial Start Position is set"
     REQUIRE(LogTestController::getInstance().contains("Size:" + std::to_string(NEWLINE_FILE.find_first_of('\n') + 1) + " Offset:0"));
 
     plan->reset(true);
-    LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+    LogTestController::getInstance().clear();
 
     appendTempFile(dir, TMP_FILE, NEW_TAIL_DATA);
 
@@ -1551,7 +1551,7 @@ TEST_CASE("TailFile reads from a single file when Initial Start Position is set"
     REQUIRE(LogTestController::getInstance().contains("Size:" + std::to_string(ROLLED_OVER_TAIL_DATA.find_first_of('\n') + 1) + " Offset:0"));
 
     plan->reset(true);
-    LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+    LogTestController::getInstance().clear();
 
     appendTempFile(dir, TMP_FILE, NEW_TAIL_DATA);
 
@@ -1569,7 +1569,7 @@ TEST_CASE("TailFile reads from a single file when Initial Start Position is set"
     REQUIRE(LogTestController::getInstance().contains("Logged 0 flow files"));
 
     plan->reset(true);
-    LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+    LogTestController::getInstance().clear();
 
     appendTempFile(dir, TMP_FILE, NEW_TAIL_DATA);
 
@@ -1604,7 +1604,7 @@ TEST_CASE("TailFile reads from a single file when Initial Start Position is set
   REQUIRE(LogTestController::getInstance().contains("Logged 0 flow files"));
 
   plan->reset(true);
-  LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
 
   const std::string DATA_IN_NEW_FILE = "data in new file\n";
   std::this_thread::sleep_for(std::chrono::milliseconds(100));  // make sure the new file gets newer modification time
@@ -1652,7 +1652,7 @@ TEST_CASE("TailFile reads multiple files when Initial Start Position is set", "[
     REQUIRE(LogTestController::getInstance().contains("Size:" + std::to_string(TMP_FILE_2_DATA.find_first_of('\n') + 1) + " Offset:0"));
 
     plan->reset(true);
-    LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+    LogTestController::getInstance().clear();
 
     createTempFile(dir, "minifi-tmpfile-3.txt", ADDITIONALY_CREATED_FILE_CONTENT);
     appendTempFile(dir, TMP_FILE, NEW_TAIL_DATA);
@@ -1675,7 +1675,7 @@ TEST_CASE("TailFile reads multiple files when Initial Start Position is set", "[
     REQUIRE(LogTestController::getInstance().contains("Size:" + std::to_string(TMP_FILE_2_DATA.find_first_of('\n') + 1) + " Offset:0"));
 
     plan->reset(true);
-    LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+    LogTestController::getInstance().clear();
 
     createTempFile(dir, "minifi-tmpfile-3.txt", ADDITIONALY_CREATED_FILE_CONTENT);
     appendTempFile(dir, TMP_FILE, NEW_TAIL_DATA);
@@ -1695,7 +1695,7 @@ TEST_CASE("TailFile reads multiple files when Initial Start Position is set", "[
     REQUIRE(LogTestController::getInstance().contains("Logged 0 flow files"));
 
     plan->reset(true);
-    LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+    LogTestController::getInstance().clear();
 
     createTempFile(dir, "minifi-tmpfile-3.txt", ADDITIONALY_CREATED_FILE_CONTENT);
     appendTempFile(dir, TMP_FILE, NEW_TAIL_DATA);
diff --git a/extensions/windows-event-log/tests/CWELTestUtils.h b/extensions/windows-event-log/tests/CWELTestUtils.h
index 0a0bd85ee..efe240141 100644
--- a/extensions/windows-event-log/tests/CWELTestUtils.h
+++ b/extensions/windows-event-log/tests/CWELTestUtils.h
@@ -69,7 +69,7 @@ class OutputFormatTestController : public TestController {
     }
 
     test_plan->reset();
-    LogTestController::resetStream(LogTestController::getInstance().log_output);
+    LogTestController::getInstance().clear();
 
 
     {
diff --git a/extensions/windows-event-log/tests/ConsumeWindowsEventLogTests.cpp b/extensions/windows-event-log/tests/ConsumeWindowsEventLogTests.cpp
index 44a2f125f..ee9020161 100644
--- a/extensions/windows-event-log/tests/ConsumeWindowsEventLogTests.cpp
+++ b/extensions/windows-event-log/tests/ConsumeWindowsEventLogTests.cpp
@@ -152,7 +152,7 @@ TEST_CASE("ConsumeWindowsEventLog can consume new events", "[onTrigger]") {
   // later runs will start with a bookmark saved in the state manager
 
   test_plan->reset();
-  LogTestController::resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
 
   SECTION("Read one event") {
     reportEvent(APPLICATION_CHANNEL, "Event one");
@@ -198,7 +198,7 @@ TEST_CASE("ConsumeWindowsEventLog bookmarking works", "[onTrigger]") {
   CHECK(LogTestController::getInstance().contains("processed 0 Events"));
 
   test_plan->reset();
-  LogTestController::resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
 
   SECTION("Read in one go") {
     reportEvent(APPLICATION_CHANNEL, "Event one");
@@ -219,7 +219,7 @@ TEST_CASE("ConsumeWindowsEventLog bookmarking works", "[onTrigger]") {
     reportEvent(APPLICATION_CHANNEL, "Event three");
 
     test_plan->reset();
-    LogTestController::resetStream(LogTestController::getInstance().log_output);
+    LogTestController::getInstance().clear();
 
     TestController::runSession(test_plan);
     CHECK(LogTestController::getInstance().contains("processed 2 Events"));
@@ -259,7 +259,7 @@ TEST_CASE("ConsumeWindowsEventLog extracts some attributes by default", "[onTrig
   }
 
   test_plan->reset();
-  LogTestController::resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
 
   // 1st event, on Info level
   {
@@ -272,7 +272,7 @@ TEST_CASE("ConsumeWindowsEventLog extracts some attributes by default", "[onTrig
   }
 
   test_plan->reset();
-  LogTestController::resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
 
   // 2st event, on Warning level
   {
@@ -308,7 +308,7 @@ void outputFormatSetterTestHelper(const std::string &output_format, int expected
   }
 
   test_plan->reset();
-  LogTestController::resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
 
   {
     reportEvent(APPLICATION_CHANNEL, "Event one");
@@ -442,7 +442,7 @@ void batchCommitSizeTestHelper(std::size_t num_events_read, std::size_t batch_co
   }
 
   test_plan->reset();
-  LogTestController::resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
 
   auto generate_events = [](const std::size_t event_count) {
     std::vector<std::string> events;
diff --git a/libminifi/include/utils/IntegrationTestUtils.h b/libminifi/include/utils/IntegrationTestUtils.h
index 4d96132b7..1799a6b87 100644
--- a/libminifi/include/utils/IntegrationTestUtils.h
+++ b/libminifi/include/utils/IntegrationTestUtils.h
@@ -44,7 +44,7 @@ bool verifyEventHappenedInPollTime(
 template <class Rep, class Period, typename ...String>
 bool verifyLogLinePresenceInPollTime(const std::chrono::duration<Rep, Period>& wait_duration, String&&... patterns) {
   auto check = [&patterns...] {
-    const std::string logs = LogTestController::getInstance().log_output.str();
+    const std::string logs = LogTestController::getInstance().getLogs();
     return ((logs.find(patterns) != std::string::npos) && ...);
   };
   return verifyEventHappenedInPollTime(wait_duration, check);
diff --git a/libminifi/test/LogUtils.h b/libminifi/test/LogUtils.h
index 942775535..5fedd0a75 100644
--- a/libminifi/test/LogUtils.h
+++ b/libminifi/test/LogUtils.h
@@ -21,27 +21,34 @@
 #include <memory>
 #include <string>
 #include <utility>
+#include <mutex>
 
 #include "spdlog/sinks/sink.h"
 #include "spdlog/sinks/ostream_sink.h"
 
 class StringStreamSink : public spdlog::sinks::sink {
  public:
-  explicit StringStreamSink(std::shared_ptr<std::ostringstream> stream, bool force_flush = false)
-    : stream_(std::move(stream)), sink_(*stream_, force_flush) {}
+  explicit StringStreamSink(std::shared_ptr<std::ostringstream> stream, std::shared_ptr<std::mutex> log_output_mutex, bool force_flush = false)
+      : stream_(std::move(stream)),
+        log_output_mutex_(std::move(log_output_mutex)),
+        sink_(*stream_, force_flush) {}
 
   ~StringStreamSink() override = default;
 
   void log(const spdlog::details::log_msg &msg) override {
+    std::lock_guard<std::mutex> guard(*log_output_mutex_);
     sink_.log(msg);
   }
   void flush() override {
+    std::lock_guard<std::mutex> guard(*log_output_mutex_);
     sink_.flush();
   }
   void set_pattern(const std::string &pattern) override {
+    std::lock_guard<std::mutex> guard(*log_output_mutex_);
     sink_.set_pattern(pattern);
   }
   void set_formatter(std::unique_ptr<spdlog::formatter> sink_formatter) override {
+    std::lock_guard<std::mutex> guard(*log_output_mutex_);
     sink_.set_formatter(std::move(sink_formatter));
   }
 
@@ -51,5 +58,6 @@ class StringStreamSink : public spdlog::sinks::sink {
   // static storage duration, thus they might outlive the provider of
   // the stream
   std::shared_ptr<std::ostringstream> stream_;
+  std::shared_ptr<std::mutex> log_output_mutex_;
   spdlog::sinks::ostream_sink_mt sink_;
 };
diff --git a/libminifi/test/TestBase.cpp b/libminifi/test/TestBase.cpp
index ba2cb6d92..cb61f540f 100644
--- a/libminifi/test/TestBase.cpp
+++ b/libminifi/test/TestBase.cpp
@@ -92,6 +92,14 @@ void LogTestController::setLevelByClassName(spdlog::level::level_enum level, con
 }
 
 bool LogTestController::contains(const std::ostringstream& stream, const std::string& ending, std::chrono::milliseconds timeout, std::chrono::milliseconds sleep_interval) const {
+  return contains([&stream](){ return stream.str(); }, ending, timeout, sleep_interval);
+}
+
+bool LogTestController::contains(const std::string& ending, std::chrono::milliseconds timeout, std::chrono::milliseconds sleep_interval) const {
+  return contains([this](){ return getLogs(); }, ending, timeout, sleep_interval);
+}
+
+bool LogTestController::contains(const std::function<std::string()>& log_string_getter, const std::string& ending, std::chrono::milliseconds timeout, std::chrono::milliseconds sleep_interval) const {
   if (ending.length() == 0) {
     return false;
   }
@@ -99,7 +107,7 @@ bool LogTestController::contains(const std::ostringstream& stream, const std::st
   bool found = false;
   bool timed_out = false;
   do {
-    std::string str = stream.str();
+    std::string str = log_string_getter();
     found = (str.find(ending) != std::string::npos);
     auto now = std::chrono::steady_clock::now();
     timed_out = (now - start > timeout);
@@ -122,7 +130,7 @@ std::optional<std::smatch> LogTestController::matchesRegex(const std::string& re
   std::regex matcher_regex(regex_str);
   std::smatch match;
   do {
-    std::string str = log_output.str();
+    std::string str = getLogs();
     found = std::regex_search(str, match, matcher_regex);
     auto now = std::chrono::steady_clock::now();
     timed_out = (now - start > timeout);
@@ -136,7 +144,7 @@ std::optional<std::smatch> LogTestController::matchesRegex(const std::string& re
 }
 
 int LogTestController::countOccurrences(const std::string& pattern) const {
-  return minifi::utils::StringUtils::countOccurrences(log_output.str(), pattern).second;
+  return minifi::utils::StringUtils::countOccurrences(getLogs(), pattern).second;
 }
 
 void LogTestController::reset() {
@@ -150,7 +158,9 @@ void LogTestController::reset() {
 }
 
 void LogTestController::clear() {
-  resetStream(log_output);
+  std::lock_guard<std::mutex> guard(*log_output_mutex_);
+  gsl_Expects(log_output_ptr_);
+  resetStream(*log_output_ptr_);
 }
 
 void LogTestController::resetStream(std::ostringstream& stream) {
@@ -159,6 +169,7 @@ void LogTestController::resetStream(std::ostringstream& stream) {
 }
 
 LogTestController::LogTestController(const std::shared_ptr<logging::LoggerProperties>& loggerProps) {
+  gsl_Expects(log_output_ptr_);
   my_properties_ = loggerProps;
   bool initMain = false;
   if (nullptr == my_properties_) {
@@ -169,7 +180,7 @@ LogTestController::LogTestController(const std::shared_ptr<logging::LoggerProper
   my_properties_->set("logger." + minifi::core::getClassName<LogTestController>(), "INFO");
   my_properties_->set("logger." + minifi::core::getClassName<logging::LoggerConfiguration>(), "INFO");
   std::shared_ptr<spdlog::sinks::dist_sink_mt> dist_sink = std::make_shared<spdlog::sinks::dist_sink_mt>();
-  dist_sink->add_sink(std::make_shared<StringStreamSink>(log_output_ptr, true));
+  dist_sink->add_sink(std::make_shared<StringStreamSink>(log_output_ptr_, log_output_mutex_, true));
   dist_sink->add_sink(std::make_shared<spdlog::sinks::stderr_sink_mt>());
   my_properties_->add_sink("ostream", dist_sink);
   if (initMain) {
diff --git a/libminifi/test/TestBase.h b/libminifi/test/TestBase.h
index 147a91911..e2118144e 100644
--- a/libminifi/test/TestBase.h
+++ b/libminifi/test/TestBase.h
@@ -26,6 +26,7 @@
 #include <string>
 #include <utility>
 #include <vector>
+#include <mutex>
 
 #include "spdlog/common.h"
 
@@ -129,9 +130,7 @@ class LogTestController {
 
   void setLevelByClassName(spdlog::level::level_enum level, const std::string& class_name);
 
-  bool contains(const std::string &ending, std::chrono::milliseconds timeout = std::chrono::seconds(3), std::chrono::milliseconds sleep_interval = std::chrono::milliseconds(200)) const {
-    return contains(log_output, ending, timeout, sleep_interval);
-  }
+  bool contains(const std::string &ending, std::chrono::milliseconds timeout = std::chrono::seconds(3), std::chrono::milliseconds sleep_interval = std::chrono::milliseconds(200)) const;
 
   bool contains(const std::ostringstream &stream, const std::string &ending,
                 std::chrono::milliseconds timeout = std::chrono::seconds(3),
@@ -149,8 +148,11 @@ class LogTestController {
 
   static void resetStream(std::ostringstream &stream);
 
-  std::shared_ptr<std::ostringstream> log_output_ptr = std::make_shared<std::ostringstream>();
-  std::ostringstream& log_output = *log_output_ptr;
+  std::string getLogs() const {
+    std::lock_guard<std::mutex> guard(*log_output_mutex_);
+    gsl_Expects(log_output_ptr_);
+    return log_output_ptr_->str();
+  }
 
   std::shared_ptr<logging::Logger> logger_;
 
@@ -162,7 +164,10 @@ class LogTestController {
   explicit LogTestController(const std::shared_ptr<logging::LoggerProperties> &loggerProps);
 
   void setLevel(const std::string& name, spdlog::level::level_enum level);
+  bool contains(const std::function<std::string()>& log_string_getter, const std::string& ending, std::chrono::milliseconds timeout, std::chrono::milliseconds sleep_interval) const;
 
+  mutable std::shared_ptr<std::mutex> log_output_mutex_ = std::make_shared<std::mutex>();
+  std::shared_ptr<std::ostringstream> log_output_ptr_ = std::make_shared<std::ostringstream>();
   std::shared_ptr<logging::LoggerProperties> my_properties_;
   std::unique_ptr<logging::LoggerConfiguration> config;
   std::vector<std::string> modified_loggers;
diff --git a/libminifi/test/azure-tests/ListAzureBlobStorageTests.cpp b/libminifi/test/azure-tests/ListAzureBlobStorageTests.cpp
index 9fec6d41e..7164becb1 100644
--- a/libminifi/test/azure-tests/ListAzureBlobStorageTests.cpp
+++ b/libminifi/test/azure-tests/ListAzureBlobStorageTests.cpp
@@ -246,7 +246,7 @@ TEST_CASE_METHOD(ListAzureBlobStorageTestsFixture, "List all files every time",
   };
   run_assertions();
   plan_->reset();
-  LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
   test_controller_.runSession(plan_, true);
   run_assertions();
 }
@@ -279,7 +279,7 @@ TEST_CASE_METHOD(ListAzureBlobStorageTestsFixture, "Do not list same files the s
   CHECK(verifyLogLinePresenceInPollTime(1s, "key:lang value:en-US"));
   CHECK(verifyLogLinePresenceInPollTime(1s, "key:lang value:de-DE"));
   plan_->reset();
-  LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
   test_controller_.runSession(plan_, true);
   REQUIRE_FALSE(LogTestController::getInstance().contains("key:azure", 0s, 0ms));
 }
diff --git a/libminifi/test/azure-tests/ListAzureDataLakeStorageTests.cpp b/libminifi/test/azure-tests/ListAzureDataLakeStorageTests.cpp
index d91771ccd..d6682a710 100644
--- a/libminifi/test/azure-tests/ListAzureDataLakeStorageTests.cpp
+++ b/libminifi/test/azure-tests/ListAzureDataLakeStorageTests.cpp
@@ -118,7 +118,7 @@ TEST_CASE_METHOD(ListAzureDataLakeStorageTestsFixture, "List all files every tim
   };
   run_assertions();
   plan_->reset();
-  LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
   test_controller_.runSession(plan_, true);
   run_assertions();
 }
@@ -147,7 +147,7 @@ TEST_CASE_METHOD(ListAzureDataLakeStorageTestsFixture, "Do not list same files t
   CHECK(verifyLogLinePresenceInPollTime(1s, "key:azure.lastModified value:" + mock_data_lake_storage_client_ptr_->ITEM1_LAST_MODIFIED + "\n"));
   CHECK(verifyLogLinePresenceInPollTime(1s, "key:azure.lastModified value:" + mock_data_lake_storage_client_ptr_->ITEM2_LAST_MODIFIED + "\n"));
   plan_->reset();
-  LogTestController::getInstance().resetStream(LogTestController::getInstance().log_output);
+  LogTestController::getInstance().clear();
   test_controller_.runSession(plan_, true);
   REQUIRE_FALSE(LogTestController::getInstance().contains("key:azure", 0s, 0ms));
 }
diff --git a/libminifi/test/integration/OnScheduleErrorHandlingTests.cpp b/libminifi/test/integration/OnScheduleErrorHandlingTests.cpp
index b20d34164..78526ce7b 100644
--- a/libminifi/test/integration/OnScheduleErrorHandlingTests.cpp
+++ b/libminifi/test/integration/OnScheduleErrorHandlingTests.cpp
@@ -35,7 +35,7 @@ class KamikazeErrorHandlingTests : public IntegrationBase {
   void runAssertions() override {
     using org::apache::nifi::minifi::utils::verifyEventHappenedInPollTime;
     assert(verifyEventHappenedInPollTime(wait_time_, [&] {
-      const std::string logs = LogTestController::getInstance().log_output.str();
+      const std::string logs = LogTestController::getInstance().getLogs();
       const auto result = utils::StringUtils::countOccurrences(logs, minifi::processors::KamikazeProcessor::OnScheduleExceptionStr);
       const int occurrences = result.second;
       return 1 < occurrences;
@@ -48,7 +48,7 @@ class KamikazeErrorHandlingTests : public IntegrationBase {
                                                  "[warning] ProcessSession rollback for kamikaze executed"};
 
     const bool test_success = verifyEventHappenedInPollTime(std::chrono::milliseconds(wait_time_), [&] {
-      const std::string logs = LogTestController::getInstance().log_output.str();
+      const std::string logs = LogTestController::getInstance().getLogs();
       const auto result = utils::StringUtils::countOccurrences(logs, minifi::processors::KamikazeProcessor::OnScheduleExceptionStr);
       size_t last_pos = result.first;
       for (const std::string& msg : must_appear_byorder_msgs) {
@@ -61,7 +61,7 @@ class KamikazeErrorHandlingTests : public IntegrationBase {
     });
     assert(test_success);
 
-    assert(LogTestController::getInstance().log_output.str().find(minifi::processors::KamikazeProcessor::OnTriggerLogStr) == std::string::npos);
+    assert(LogTestController::getInstance().getLogs().find(minifi::processors::KamikazeProcessor::OnTriggerLogStr) == std::string::npos);
   }
 
   void testSetup() override {
@@ -104,7 +104,7 @@ class EventDriverScheduleErrorHandlingTests: public IntegrationBase {
   }
 
   void runAssertions() override {
-    std::string logs = LogTestController::getInstance().log_output.str();
+    std::string logs = LogTestController::getInstance().getLogs();
     assert(logs.find("EventDrivenSchedulingAgent cannot schedule processor without incoming connection!") != std::string::npos);
   }
 
diff --git a/libminifi/test/integration/StateTransactionalityTests.cpp b/libminifi/test/integration/StateTransactionalityTests.cpp
index 97602a07c..ff3d86e95 100644
--- a/libminifi/test/integration/StateTransactionalityTests.cpp
+++ b/libminifi/test/integration/StateTransactionalityTests.cpp
@@ -104,14 +104,14 @@ const std::unordered_map<std::string, std::string> exampleState{{"key1", "value1
 const std::unordered_map<std::string, std::string> exampleState2{{"key3", "value3"}, {"key4", "value4"}};
 
 auto standardLogChecker = [] {
-  const std::string logs = LogTestController::getInstance().log_output.str();
+  const std::string logs = LogTestController::getInstance().getLogs();
   const auto errorResult = utils::StringUtils::countOccurrences(logs, "[error]");
   const auto warningResult = utils::StringUtils::countOccurrences(logs, "[warning]");
   return errorResult.second == 0 && warningResult.second == 0;
 };
 
 auto commitAndRollbackWarnings = [] {
-  const std::string logs = LogTestController::getInstance().log_output.str();
+  const std::string logs = LogTestController::getInstance().getLogs();
   const auto errorResult = utils::StringUtils::countOccurrences(logs, "[error]");
   const auto commitWarningResult = utils::StringUtils::countOccurrences(logs, "[warning] Caught \"Process Session Operation: State manager commit failed.\"");
   const auto rollbackWarningFirst = utils::StringUtils::countOccurrences(logs, "[warning] Caught Exception during process session rollback");
@@ -120,7 +120,7 @@ auto commitAndRollbackWarnings = [] {
 };
 
 auto exceptionRollbackWarnings = [] {
-  const std::string logs = LogTestController::getInstance().log_output.str();
+  const std::string logs = LogTestController::getInstance().getLogs();
   const auto errorResult = utils::StringUtils::countOccurrences(logs, "[error]");
   const auto exceptionWarningResult = utils::StringUtils::countOccurrences(logs, "[warning] Caught \"Triggering rollback\"");
   const auto rollbackWarningResult = utils::StringUtils::countOccurrences(logs, "[warning] ProcessSession rollback for statefulProcessor executed");