You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by pv...@apache.org on 2026/07/22 06:04:28 UTC
(nifi) branch main updated: NIFI-16132 Added Component ID to Standard Component Log MDC (#11452)
This is an automated email from the ASF dual-hosted git repository.
pvillard31 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 59cff970ca8 NIFI-16132 Added Component ID to Standard Component Log MDC (#11452)
59cff970ca8 is described below
commit 59cff970ca8b98ee51ae4418cf4de6830fa28c37
Author: David Handermann <ex...@apache.org>
AuthorDate: Wed Jul 22 01:04:21 2026 -0500
NIFI-16132 Added Component ID to Standard Component Log MDC (#11452)
- Renamed SimpleProcessLogger to StandardComponentLog
- Adjusted constructors to require componentId in both cases
---
.../nifi/controller/StandardProcessorNode.java | 6 ++--
.../flowanalysis/AbstractFlowAnalysisRuleNode.java | 4 +--
.../service/StandardControllerServiceNode.java | 6 ++--
.../controller/state/StandardStateManager.java | 4 +--
.../manager/StandardStateManagerProvider.java | 4 +--
...rocessLogger.java => StandardComponentLog.java} | 38 +++++++++++++++++-----
...ssLogger.java => StandardComponentLogTest.java} | 8 +++--
.../apache/nifi/controller/ExtensionBuilder.java | 12 +++----
.../nifi/controller/StandardReloadComponent.java | 14 ++++----
.../flow/StandardStatelessGroupNodeFactory.java | 5 +--
.../scheduling/StandardProcessScheduler.java | 6 ++--
.../nifi/controller/tasks/ConnectableTask.java | 6 ++--
.../controller/tasks/ReportingTaskWrapper.java | 4 +--
.../web/dao/impl/StandardControllerServiceDAO.java | 10 +++---
.../web/dao/impl/StandardFlowAnalysisRuleDAO.java | 10 +++---
.../nifi/web/dao/impl/StandardFlowRegistryDAO.java | 6 ++--
.../web/dao/impl/StandardParameterProviderDAO.java | 10 +++---
.../nifi/web/dao/impl/StandardProcessorDAO.java | 10 +++---
.../web/dao/impl/StandardReportingTaskDAO.java | 10 +++---
.../nifi/stateless/engine/ComponentBuilder.java | 8 ++---
.../stateless/engine/StatelessReloadComponent.java | 12 +++----
.../stateless/engine/StatelessSchedulingAgent.java | 4 +--
22 files changed, 111 insertions(+), 86 deletions(-)
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
index f8b0fde8afc..042f99630b7 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
@@ -91,7 +91,7 @@ import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSessionFactory;
import org.apache.nifi.processor.Processor;
import org.apache.nifi.processor.Relationship;
-import org.apache.nifi.processor.SimpleProcessLogger;
+import org.apache.nifi.processor.StandardComponentLog;
import org.apache.nifi.processor.VerifiableProcessor;
import org.apache.nifi.scheduling.ExecutionNode;
import org.apache.nifi.scheduling.SchedulingStrategy;
@@ -1494,7 +1494,7 @@ public class StandardProcessorNode extends ProcessorNode implements Connectable
final ScheduledState scheduledState, final boolean triggerLifecycleMethods) {
final Processor processor = processorRef.get().getProcessor();
- final ComponentLog procLog = new SimpleProcessLogger(StandardProcessorNode.this.getIdentifier(), processor, new StandardLoggingContext(StandardProcessorNode.this));
+ final ComponentLog procLog = new StandardComponentLog(StandardProcessorNode.this.getIdentifier(), processor, new StandardLoggingContext(StandardProcessorNode.this));
LOG.debug("Starting {}", this);
ScheduledState currentState;
@@ -1639,7 +1639,7 @@ public class StandardProcessorNode extends ProcessorNode implements Connectable
final boolean triggerLifecycleMethods) {
final Processor processor = getProcessor();
- final ComponentLog procLog = new SimpleProcessLogger(StandardProcessorNode.this.getIdentifier(), processor, new StandardLoggingContext(StandardProcessorNode.this));
+ final ComponentLog procLog = new StandardComponentLog(StandardProcessorNode.this.getIdentifier(), processor, new StandardLoggingContext(StandardProcessorNode.this));
// Completion Timestamp is set to MAX_VALUE because we don't want to timeout until the task has a chance to run.
final AtomicLong completionTimestampRef = new AtomicLong(Long.MAX_VALUE);
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/flowanalysis/AbstractFlowAnalysisRuleNode.java b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/flowanalysis/AbstractFlowAnalysisRuleNode.java
index 9a935bf55e5..9c86ba831a4 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/flowanalysis/AbstractFlowAnalysisRuleNode.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/flowanalysis/AbstractFlowAnalysisRuleNode.java
@@ -47,7 +47,7 @@ import org.apache.nifi.nar.ExtensionManager;
import org.apache.nifi.nar.InstanceClassLoader;
import org.apache.nifi.nar.NarCloseable;
import org.apache.nifi.parameter.ParameterLookup;
-import org.apache.nifi.processor.SimpleProcessLogger;
+import org.apache.nifi.processor.StandardComponentLog;
import org.apache.nifi.util.CharacterFilterUtils;
import org.apache.nifi.util.FormatUtils;
import org.apache.nifi.util.ReflectionUtils;
@@ -282,7 +282,7 @@ public abstract class AbstractFlowAnalysisRuleNode extends AbstractComponentNode
} catch (Exception e) {
final Throwable cause = e instanceof InvocationTargetException ? e.getCause() : e;
- final ComponentLog componentLog = new SimpleProcessLogger(getIdentifier(), getFlowAnalysisRule(), new StandardLoggingContext());
+ final ComponentLog componentLog = new StandardComponentLog(getIdentifier(), getFlowAnalysisRule(), new StandardLoggingContext());
componentLog.error("Failed to invoke {} method", cause);
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceNode.java b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceNode.java
index c46047bff60..32c402dca95 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceNode.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceNode.java
@@ -70,7 +70,7 @@ import org.apache.nifi.nar.InstanceClassLoader;
import org.apache.nifi.nar.NarCloseable;
import org.apache.nifi.parameter.ParameterContext;
import org.apache.nifi.parameter.ParameterLookup;
-import org.apache.nifi.processor.SimpleProcessLogger;
+import org.apache.nifi.processor.StandardComponentLog;
import org.apache.nifi.util.CharacterFilterUtils;
import org.apache.nifi.util.FormatUtils;
import org.apache.nifi.util.ReflectionUtils;
@@ -737,7 +737,7 @@ public class StandardControllerServiceNode extends AbstractComponentNode impleme
}
final Throwable cause = e instanceof InvocationTargetException ? e.getCause() : e;
- final ComponentLog componentLog = new SimpleProcessLogger(getIdentifier(), controllerService, new StandardLoggingContext(serviceNode));
+ final ComponentLog componentLog = new StandardComponentLog(getIdentifier(), controllerService, new StandardLoggingContext(serviceNode));
componentLog.error("Failed to invoke @OnEnabled method", cause);
invokeDisable(configContext);
@@ -832,7 +832,7 @@ public class StandardControllerServiceNode extends AbstractComponentNode impleme
LOG.debug("Successfully disabled {}", this);
} catch (Exception e) {
final Throwable cause = e instanceof InvocationTargetException ? e.getCause() : e;
- final ComponentLog componentLog = new SimpleProcessLogger(getIdentifier(), controllerService, new StandardLoggingContext(StandardControllerServiceNode.this));
+ final ComponentLog componentLog = new StandardComponentLog(getIdentifier(), controllerService, new StandardLoggingContext(StandardControllerServiceNode.this));
componentLog.error("Failed to invoke @OnDisabled method due to {}", cause);
LOG.error("Failed to invoke @OnDisabled method of {} due to {}", getControllerServiceImplementation(), cause.toString());
}
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/state/StandardStateManager.java b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/state/StandardStateManager.java
index 27cd9d7a8c5..a3ce131a9a8 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/state/StandardStateManager.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/state/StandardStateManager.java
@@ -25,7 +25,7 @@ import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.logging.LogRepository;
import org.apache.nifi.logging.LogRepositoryFactory;
import org.apache.nifi.logging.StandardLoggingContext;
-import org.apache.nifi.processor.SimpleProcessLogger;
+import org.apache.nifi.processor.StandardComponentLog;
import java.io.IOException;
import java.util.Map;
@@ -61,7 +61,7 @@ public class StandardStateManager implements StateManager {
final LogRepository repo = LogRepositoryFactory.getRepository(componentId);
final ComponentLog logger = (repo == null) ? null : repo.getLogger();
if (repo == null || logger == null) {
- return new SimpleProcessLogger(componentId, this, new StandardLoggingContext());
+ return new StandardComponentLog(componentId, this, new StandardLoggingContext());
}
return logger;
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/state/manager/StandardStateManagerProvider.java b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/state/manager/StandardStateManagerProvider.java
index b123e1215da..ac624224671 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/state/manager/StandardStateManagerProvider.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/state/manager/StandardStateManagerProvider.java
@@ -51,7 +51,7 @@ import org.apache.nifi.parameter.ExpressionLanguageAwareParameterParser;
import org.apache.nifi.parameter.ParameterLookup;
import org.apache.nifi.parameter.ParameterParser;
import org.apache.nifi.parameter.ParameterTokenList;
-import org.apache.nifi.processor.SimpleProcessLogger;
+import org.apache.nifi.processor.StandardComponentLog;
import org.apache.nifi.processor.StandardValidationContext;
import org.apache.nifi.util.NiFiProperties;
import org.slf4j.Logger;
@@ -328,7 +328,7 @@ public class StandardStateManagerProvider implements StateManagerProvider {
propertyMap.put(descriptor, new StandardPropertyValue(resourceContext, entry.getValue(), null, parameterLookup));
}
- final ComponentLog logger = new SimpleProcessLogger(providerConfig.getId(), provider, new StandardLoggingContext());
+ final ComponentLog logger = new StandardComponentLog(providerConfig.getId(), provider, new StandardLoggingContext());
final StateProviderInitializationContext initContext = new StandardStateProviderInitializationContext(providerConfig.getId(), propertyMap, sslContext, logger);
synchronized (provider) {
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/processor/StandardComponentLog.java
similarity index 90%
rename from nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java
rename to nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/processor/StandardComponentLog.java
index d4e1ed7c788..5c455082225 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/processor/StandardComponentLog.java
@@ -32,30 +32,48 @@ import org.slf4j.spi.LoggingEventBuilder;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Optional;
import java.util.Set;
-public class SimpleProcessLogger implements ComponentLog {
+public class StandardComponentLog implements ComponentLog {
private static final String CAUSED_BY = String.format("%n- Caused by: ");
private static final Throwable NULL_THROWABLE = null;
+ private static final String COMPONENT_ID_ATTRIBUTE_KEY = "componentId";
+ private final String componentId;
+ private final Object component;
private final Logger logger;
private final LogRepository logRepository;
- private final Object component;
-
private final LoggingContext loggingContext;
- public SimpleProcessLogger(final String componentId, final Object component, final LoggingContext loggingContext) {
- this(component, LogRepositoryFactory.getRepository(componentId), loggingContext);
+ /**
+ * Constructor with required properties and LogRepository located using Component ID
+ *
+ * @param componentId Component Identifier required
+ * @param component Component Object from which to determine Logger class
+ * @param loggingContext Logging Context required for additional attributes
+ */
+ public StandardComponentLog(final String componentId, final Object component, final LoggingContext loggingContext) {
+ this(componentId, component, loggingContext, LogRepositoryFactory.getRepository(componentId));
}
- public SimpleProcessLogger(final Object component, final LogRepository logRepository, final LoggingContext loggingContext) {
+ /**
+ * Constructor with required properties and provided LogRepository implementation
+ *
+ * @param componentId Component Identifier required
+ * @param component Component Object from which to determine Logger class
+ * @param loggingContext Logging Context required for additional attributes
+ * @param logRepository Log Repository implementation required
+ */
+ public StandardComponentLog(final String componentId, final Object component, final LoggingContext loggingContext, final LogRepository logRepository) {
+ this.componentId = Objects.requireNonNull(componentId, "Component ID required");
+ this.component = Objects.requireNonNull(component, "Component required");
this.logger = LoggerFactory.getLogger(component.getClass());
- this.logRepository = logRepository;
- this.component = component;
- this.loggingContext = loggingContext;
+ this.loggingContext = Objects.requireNonNull(loggingContext, "Logging Context required");
+ this.logRepository = Objects.requireNonNull(logRepository, "Log Repository required");
}
@Override
@@ -476,11 +494,13 @@ public class SimpleProcessLogger implements ComponentLog {
final Map<String, String> attributes = loggingContext.getAttributes();
final Set<String> attributeKeys = attributes.keySet();
try {
+ MDC.put(COMPONENT_ID_ATTRIBUTE_KEY, componentId);
attributes.forEach(MDC::put);
builder.log(message, arguments);
} finally {
// Remove MDC attributes after logging
attributeKeys.forEach(MDC::remove);
+ MDC.remove(COMPONENT_ID_ATTRIBUTE_KEY);
}
}
}
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/processor/TestSimpleProcessLogger.java b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/processor/StandardComponentLogTest.java
similarity index 98%
rename from nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/processor/TestSimpleProcessLogger.java
rename to nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/processor/StandardComponentLogTest.java
index 97c7b6ecb6e..1d5ff5fdb0e 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/processor/TestSimpleProcessLogger.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/processor/StandardComponentLogTest.java
@@ -45,7 +45,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
-public class TestSimpleProcessLogger {
+public class StandardComponentLogTest {
private static final String FIRST_MESSAGE = "FIRST";
private static final String SECOND_MESSAGE = "SECOND";
@@ -87,6 +87,8 @@ public class TestSimpleProcessLogger {
private static final String GROUP_ID_KEY = "groupId";
+ private static final String COMPONENT_ID = "component-id";
+
@Mock
private ConfigurableComponent component;
@@ -110,13 +112,13 @@ public class TestSimpleProcessLogger {
private Object[] componentCausesArguments;
- private SimpleProcessLogger componentLog;
+ private StandardComponentLog componentLog;
private final ArgumentCaptor<Object[]> argumentCaptor = ArgumentCaptor.forClass(Object[].class);
@BeforeEach
public void setLogger() throws IllegalAccessException {
- componentLog = new SimpleProcessLogger(component, logRepository, loggingContext);
+ componentLog = new StandardComponentLog(COMPONENT_ID, component, loggingContext, logRepository);
FieldUtils.writeDeclaredField(componentLog, "logger", logger, true);
componentArguments = new Object[]{component};
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/ExtensionBuilder.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/ExtensionBuilder.java
index 71990f7014d..1b3b865ba2b 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/ExtensionBuilder.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/ExtensionBuilder.java
@@ -88,7 +88,7 @@ import org.apache.nifi.parameter.StandardParameterProviderInitializationContext;
import org.apache.nifi.processor.GhostProcessor;
import org.apache.nifi.processor.Processor;
import org.apache.nifi.processor.ProcessorInitializationContext;
-import org.apache.nifi.processor.SimpleProcessLogger;
+import org.apache.nifi.processor.StandardComponentLog;
import org.apache.nifi.processor.StandardProcessorInitializationContext;
import org.apache.nifi.processor.StandardValidationContextFactory;
import org.apache.nifi.python.PythonBridge;
@@ -524,7 +524,7 @@ public class ExtensionBuilder {
final String componentType = connector.getClass().getSimpleName();
final StandardLoggingContext loggingContext = new StandardLoggingContext();
- final ComponentLog componentLog = new SimpleProcessLogger(identifier, connector, loggingContext);
+ final ComponentLog componentLog = new StandardComponentLog(identifier, connector, loggingContext);
final ConnectorDetails connectorDetails = new ConnectorDetails(connector, bundleCoordinate, componentLog);
final StandardConnectorNode connectorNode = new StandardConnectorNode(
@@ -575,7 +575,7 @@ public class ExtensionBuilder {
final String simpleClassName = type.contains(".") ? StringUtils.substringAfterLast(type, ".") : type;
final String componentType = "(Missing) " + simpleClassName;
final StandardLoggingContext loggingContext = new StandardLoggingContext();
- final ComponentLog componentLog = new SimpleProcessLogger(identifier, ghostConnector, loggingContext);
+ final ComponentLog componentLog = new StandardComponentLog(identifier, ghostConnector, loggingContext);
final ConnectorDetails connectorDetails = new ConnectorDetails(ghostConnector, bundleCoordinate, componentLog);
// If an instance class loader has been created for this connector, remove it because it's no longer necessary.
@@ -814,7 +814,7 @@ public class ExtensionBuilder {
logger.info("Created Controller Service of type {} with identifier {}", type, identifier);
final StandardLoggingContext loggingContext = new StandardLoggingContext();
- final ComponentLog serviceLogger = new SimpleProcessLogger(identifier, serviceImpl, loggingContext);
+ final ComponentLog serviceLogger = new StandardComponentLog(identifier, serviceImpl, loggingContext);
final TerminationAwareLogger terminationAwareLogger = new TerminationAwareLogger(serviceLogger);
final StateManager stateManager = stateManagerProvider.getStateManager(identifier, serviceImpl.getClass());
@@ -1045,7 +1045,7 @@ public class ExtensionBuilder {
final Processor processor = pythonBridge.createProcessor(identifier, type, bundleCoordinate.getVersion(), true, true);
- final ComponentLog componentLog = new SimpleProcessLogger(identifier, processor, loggingContext);
+ final ComponentLog componentLog = new StandardComponentLog(identifier, processor, loggingContext);
final TerminationAwareLogger terminationAwareLogger = new TerminationAwareLogger(componentLog);
final ProcessorInitializationContext initContext = new StandardProcessorInitializationContext(identifier, terminationAwareLogger,
@@ -1108,7 +1108,7 @@ public class ExtensionBuilder {
final Object extensionInstance = rawClass.getDeclaredConstructor().newInstance();
- final ComponentLog componentLog = new SimpleProcessLogger(identifier, extensionInstance, loggingContext);
+ final ComponentLog componentLog = new StandardComponentLog(identifier, extensionInstance, loggingContext);
final TerminationAwareLogger terminationAwareLogger = new TerminationAwareLogger(componentLog);
final T cast = nodeType.cast(extensionInstance);
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardReloadComponent.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardReloadComponent.java
index 93f8b92d156..4ca87b21c05 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardReloadComponent.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardReloadComponent.java
@@ -36,7 +36,7 @@ import org.apache.nifi.nar.NarCloseable;
import org.apache.nifi.nar.PythonBundle;
import org.apache.nifi.parameter.ParameterProvider;
import org.apache.nifi.processor.Processor;
-import org.apache.nifi.processor.SimpleProcessLogger;
+import org.apache.nifi.processor.StandardComponentLog;
import org.apache.nifi.processor.StandardProcessContext;
import org.apache.nifi.registry.flow.FlowRegistryClient;
import org.apache.nifi.registry.flow.FlowRegistryClientNode;
@@ -109,7 +109,7 @@ public class StandardReloadComponent implements ReloadComponent {
newNode.setProcessGroup(existingNode.getProcessGroup());
// set the new processor in the existing node
- final ComponentLog componentLogger = new SimpleProcessLogger(id, newNode.getProcessor(), new StandardLoggingContext(newNode));
+ final ComponentLog componentLogger = new StandardComponentLog(id, newNode.getProcessor(), new StandardLoggingContext(newNode));
final TerminationAwareLogger terminationAwareLogger = new TerminationAwareLogger(componentLogger);
LogRepositoryFactory.getRepository(id).setLogger(terminationAwareLogger);
@@ -168,7 +168,7 @@ public class StandardReloadComponent implements ReloadComponent {
invocationHandler.setServiceNode(existingNode);
// create LoggableComponents for the proxy and implementation
- final ComponentLog componentLogger = new SimpleProcessLogger(id, newNode.getControllerServiceImplementation(), new StandardLoggingContext(newNode));
+ final ComponentLog componentLogger = new StandardComponentLog(id, newNode.getControllerServiceImplementation(), new StandardLoggingContext(newNode));
final TerminationAwareLogger terminationAwareLogger = new TerminationAwareLogger(componentLogger);
LogRepositoryFactory.getRepository(id).setLogger(terminationAwareLogger);
@@ -220,7 +220,7 @@ public class StandardReloadComponent implements ReloadComponent {
final ReportingTaskNode newNode = flowController.getFlowManager().createReportingTask(newType, id, bundleCoordinate, additionalUrls, true, false, classloaderIsolationKey);
// set the new reporting task into the existing node
- final ComponentLog componentLogger = new SimpleProcessLogger(id, existingNode.getReportingTask(), new StandardLoggingContext());
+ final ComponentLog componentLogger = new StandardComponentLog(id, existingNode.getReportingTask(), new StandardLoggingContext());
final TerminationAwareLogger terminationAwareLogger = new TerminationAwareLogger(componentLogger);
LogRepositoryFactory.getRepository(id).setLogger(terminationAwareLogger);
@@ -270,7 +270,7 @@ public class StandardReloadComponent implements ReloadComponent {
final FlowAnalysisRuleNode newNode = flowController.getFlowManager().createFlowAnalysisRule(newType, id, bundleCoordinate, additionalUrls, true, false, classloaderIsolationKey);
// set the new flow analysis rule into the existing node
- final ComponentLog componentLogger = new SimpleProcessLogger(id, existingNode.getFlowAnalysisRule(), new StandardLoggingContext());
+ final ComponentLog componentLogger = new StandardComponentLog(id, existingNode.getFlowAnalysisRule(), new StandardLoggingContext());
final TerminationAwareLogger terminationAwareLogger = new TerminationAwareLogger(componentLogger);
LogRepositoryFactory.getRepository(id).setLogger(terminationAwareLogger);
@@ -318,7 +318,7 @@ public class StandardReloadComponent implements ReloadComponent {
}
// set the new parameter provider into the existing node
- final ComponentLog componentLogger = new SimpleProcessLogger(id, existingNode.getParameterProvider(), new StandardLoggingContext());
+ final ComponentLog componentLogger = new StandardComponentLog(id, existingNode.getParameterProvider(), new StandardLoggingContext());
final TerminationAwareLogger terminationAwareLogger = new TerminationAwareLogger(componentLogger);
LogRepositoryFactory.getRepository(id).setLogger(terminationAwareLogger);
@@ -360,7 +360,7 @@ public class StandardReloadComponent implements ReloadComponent {
extensionManager.closeURLClassLoader(id, existingInstanceClassLoader);
// set the new flow registry client into the existing node
- final ComponentLog componentLogger = new SimpleProcessLogger(id, existingNode.getComponent(), new StandardLoggingContext());
+ final ComponentLog componentLogger = new StandardComponentLog(id, existingNode.getComponent(), new StandardLoggingContext());
final TerminationAwareLogger terminationAwareLogger = new TerminationAwareLogger(componentLogger);
LogRepositoryFactory.getRepository(id).setLogger(terminationAwareLogger);
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/flow/StandardStatelessGroupNodeFactory.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/flow/StandardStatelessGroupNodeFactory.java
index eef4bb0da95..a7d25e24a16 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/flow/StandardStatelessGroupNodeFactory.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/flow/StandardStatelessGroupNodeFactory.java
@@ -57,7 +57,7 @@ import org.apache.nifi.logging.LogRepositoryFactory;
import org.apache.nifi.logging.LoggingContext;
import org.apache.nifi.logging.StandardLoggingContext;
import org.apache.nifi.parameter.ParameterContextManager;
-import org.apache.nifi.processor.SimpleProcessLogger;
+import org.apache.nifi.processor.StandardComponentLog;
import org.apache.nifi.registry.flow.mapping.ComponentIdLookup;
import org.apache.nifi.registry.flow.mapping.FlowMappingOptions;
import org.apache.nifi.registry.flow.mapping.InstantiatedVersionedProcessGroup;
@@ -177,7 +177,8 @@ public class StandardStatelessGroupNodeFactory implements StatelessGroupNodeFact
logRepository.removeAllObservers();
logRepository.addObserver(LogLevel.WARN, new ConnectableLogObserver(bulletinRepository, statelessGroupNode));
final LoggingContext loggingContext = new StandardLoggingContext(statelessGroupNode);
- final ComponentLog componentLog = new SimpleProcessLogger(statelessGroupNode, logRepository, loggingContext);
+ final String componentId = group.getIdentifier();
+ final ComponentLog componentLog = new StandardComponentLog(componentId, statelessGroupNode, loggingContext, logRepository);
final StatelessGroupNodeInitializationContext initContext = () -> componentLog;
statelessGroupNode.initialize(initContext);
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
index a99f7284ab7..58fd1e87b3d 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
@@ -55,7 +55,7 @@ import org.apache.nifi.nar.ExtensionManager;
import org.apache.nifi.nar.NarCloseable;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.Processor;
-import org.apache.nifi.processor.SimpleProcessLogger;
+import org.apache.nifi.processor.StandardComponentLog;
import org.apache.nifi.processor.StandardProcessContext;
import org.apache.nifi.reporting.ReportingTask;
import org.apache.nifi.scheduling.SchedulingStrategy;
@@ -322,7 +322,7 @@ public final class StandardProcessScheduler implements ProcessScheduler {
}
} catch (final Exception e) {
final Throwable cause = e instanceof InvocationTargetException ? e.getCause() : e;
- final ComponentLog componentLog = new SimpleProcessLogger(reportingTask.getIdentifier(), reportingTask, new StandardLoggingContext());
+ final ComponentLog componentLog = new StandardComponentLog(reportingTask.getIdentifier(), reportingTask, new StandardLoggingContext());
componentLog.error("Failed to invoke @OnScheduled method due to {}", cause);
LOG.error("Failed to invoke the On-Scheduled Lifecycle methods of {} due to {}; administratively yielding this "
@@ -372,7 +372,7 @@ public final class StandardProcessScheduler implements ProcessScheduler {
ReflectionUtils.invokeMethodsWithAnnotation(OnUnscheduled.class, reportingTask, configurationContext);
} catch (final Exception e) {
final Throwable cause = e instanceof InvocationTargetException ? e.getCause() : e;
- final ComponentLog componentLog = new SimpleProcessLogger(reportingTask.getIdentifier(), reportingTask, new StandardLoggingContext());
+ final ComponentLog componentLog = new StandardComponentLog(reportingTask.getIdentifier(), reportingTask, new StandardLoggingContext());
componentLog.error("Failed to invoke @OnUnscheduled method due to {}", cause);
LOG.error("Failed to invoke the @OnUnscheduled methods of {} due to {}; administratively yielding this ReportingTask and will attempt to schedule it again after {}",
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ConnectableTask.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ConnectableTask.java
index 204da4a1cf1..a7c7dfc1799 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ConnectableTask.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ConnectableTask.java
@@ -45,7 +45,7 @@ import org.apache.nifi.nar.NarCloseable;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSessionFactory;
import org.apache.nifi.processor.Processor;
-import org.apache.nifi.processor.SimpleProcessLogger;
+import org.apache.nifi.processor.StandardComponentLog;
import org.apache.nifi.processor.StandardProcessContext;
import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.processor.exception.TerminatedTaskException;
@@ -280,7 +280,7 @@ public class ConnectableTask {
} finally {
try {
if (batch) {
- final ComponentLog procLog = new SimpleProcessLogger(connectable.getIdentifier(), connectable.getRunnableComponent(), new StandardLoggingContext(connectable));
+ final ComponentLog procLog = new StandardComponentLog(connectable.getIdentifier(), connectable.getRunnableComponent(), new StandardLoggingContext(connectable));
try {
rawSession.commitAsync(null, t -> {
@@ -314,7 +314,7 @@ public class ConnectableTask {
}
private ComponentLog getComponentLog() {
- return new SimpleProcessLogger(connectable.getIdentifier(), connectable.getRunnableComponent(), new StandardLoggingContext(connectable));
+ return new StandardComponentLog(connectable.getIdentifier(), connectable.getRunnableComponent(), new StandardLoggingContext(connectable));
}
}
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ReportingTaskWrapper.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ReportingTaskWrapper.java
index 8a62aa4b057..aea99dce7e3 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ReportingTaskWrapper.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ReportingTaskWrapper.java
@@ -23,7 +23,7 @@ import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.logging.StandardLoggingContext;
import org.apache.nifi.nar.ExtensionManager;
import org.apache.nifi.nar.NarCloseable;
-import org.apache.nifi.processor.SimpleProcessLogger;
+import org.apache.nifi.processor.StandardComponentLog;
import org.apache.nifi.util.ReflectionUtils;
public class ReportingTaskWrapper implements Runnable {
@@ -46,7 +46,7 @@ public class ReportingTaskWrapper implements Runnable {
try (final NarCloseable ignored = NarCloseable.withComponentNarLoader(extensionManager, taskNode.getReportingTask().getClass(), taskNode.getIdentifier())) {
taskNode.getReportingTask().onTrigger(taskNode.getReportingContext());
} catch (final Throwable t) {
- final ComponentLog componentLog = new SimpleProcessLogger(taskNode.getIdentifier(), taskNode.getReportingTask(), new StandardLoggingContext());
+ final ComponentLog componentLog = new StandardComponentLog(taskNode.getIdentifier(), taskNode.getReportingTask(), new StandardLoggingContext());
componentLog.error("Error running task {}", taskNode.getReportingTask(), t);
if (componentLog.isDebugEnabled()) {
componentLog.error("", t);
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardControllerServiceDAO.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardControllerServiceDAO.java
index 7875221cec8..b63d91f3353 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardControllerServiceDAO.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardControllerServiceDAO.java
@@ -40,7 +40,7 @@ import org.apache.nifi.logging.StandardLoggingContext;
import org.apache.nifi.logging.repository.NopLogRepository;
import org.apache.nifi.nar.ExtensionManager;
import org.apache.nifi.parameter.ParameterLookup;
-import org.apache.nifi.processor.SimpleProcessLogger;
+import org.apache.nifi.processor.StandardComponentLog;
import org.apache.nifi.util.BundleUtils;
import org.apache.nifi.web.NiFiCoreException;
import org.apache.nifi.web.ResourceNotFoundException;
@@ -464,7 +464,9 @@ public class StandardControllerServiceDAO extends ComponentDAO implements Contro
final ControllerServiceNode serviceNode = locateControllerService(controllerServiceId);
final LogRepository logRepository = new NopLogRepository();
- final ComponentLog configVerificationLog = new SimpleProcessLogger(serviceNode.getControllerServiceImplementation(), logRepository, new StandardLoggingContext(serviceNode));
+ final ComponentLog configVerificationLog = new StandardComponentLog(
+ controllerServiceId, serviceNode.getControllerServiceImplementation(), new StandardLoggingContext(serviceNode), logRepository
+ );
final ExtensionManager extensionManager = flowController.getExtensionManager();
final ParameterLookup parameterLookup = serviceNode.getProcessGroup() == null ? ParameterLookup.EMPTY : serviceNode.getProcessGroup().getParameterContext();
@@ -472,11 +474,9 @@ public class StandardControllerServiceDAO extends ComponentDAO implements Contro
parameterLookup, flowController.getControllerServiceProvider(), null);
final List<ConfigVerificationResult> verificationResults = serviceNode.verifyConfiguration(configurationContext, configVerificationLog, variables, extensionManager, parameterLookup);
- final List<ConfigVerificationResultDTO> resultsDtos = verificationResults.stream()
+ return verificationResults.stream()
.map(this::createConfigVerificationResultDto)
.collect(Collectors.toList());
-
- return resultsDtos;
}
private ConfigVerificationResultDTO createConfigVerificationResultDto(final ConfigVerificationResult result) {
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardFlowAnalysisRuleDAO.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardFlowAnalysisRuleDAO.java
index f688b6e7241..1331cebfec8 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardFlowAnalysisRuleDAO.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardFlowAnalysisRuleDAO.java
@@ -37,7 +37,7 @@ import org.apache.nifi.logging.StandardLoggingContext;
import org.apache.nifi.logging.repository.NopLogRepository;
import org.apache.nifi.nar.ExtensionManager;
import org.apache.nifi.parameter.ParameterLookup;
-import org.apache.nifi.processor.SimpleProcessLogger;
+import org.apache.nifi.processor.StandardComponentLog;
import org.apache.nifi.util.BundleUtils;
import org.apache.nifi.web.NiFiCoreException;
import org.apache.nifi.web.ResourceNotFoundException;
@@ -265,7 +265,9 @@ public class StandardFlowAnalysisRuleDAO extends ComponentDAO implements FlowAna
final FlowAnalysisRuleNode ruleNode = locateFlowAnalysisRule(flowAnalysisRuleId);
final LogRepository logRepository = new NopLogRepository();
- final ComponentLog configVerificationLog = new SimpleProcessLogger(ruleNode.getFlowAnalysisRule(), logRepository, new StandardLoggingContext());
+ final ComponentLog configVerificationLog = new StandardComponentLog(
+ flowAnalysisRuleId, ruleNode.getFlowAnalysisRule(), new StandardLoggingContext(), logRepository
+ );
final ExtensionManager extensionManager = flowController.getExtensionManager();
final ParameterLookup parameterLookup = ParameterLookup.EMPTY;
@@ -273,11 +275,9 @@ public class StandardFlowAnalysisRuleDAO extends ComponentDAO implements FlowAna
parameterLookup, flowController.getControllerServiceProvider(), null);
final List<ConfigVerificationResult> verificationResults = ruleNode.verifyConfiguration(configurationContext, configVerificationLog, extensionManager);
- final List<ConfigVerificationResultDTO> resultsDtos = verificationResults.stream()
+ return verificationResults.stream()
.map(this::createConfigVerificationResultDto)
.collect(Collectors.toList());
-
- return resultsDtos;
}
private ConfigVerificationResultDTO createConfigVerificationResultDto(final ConfigVerificationResult result) {
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardFlowRegistryDAO.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardFlowRegistryDAO.java
index f405b9684a6..3d719421d3b 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardFlowRegistryDAO.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardFlowRegistryDAO.java
@@ -25,7 +25,7 @@ import org.apache.nifi.logging.LogRepository;
import org.apache.nifi.logging.StandardLoggingContext;
import org.apache.nifi.logging.repository.NopLogRepository;
import org.apache.nifi.nar.ExtensionManager;
-import org.apache.nifi.processor.SimpleProcessLogger;
+import org.apache.nifi.processor.StandardComponentLog;
import org.apache.nifi.registry.flow.BucketLocation;
import org.apache.nifi.registry.flow.FlowLocation;
import org.apache.nifi.registry.flow.FlowRegistryBranch;
@@ -271,7 +271,9 @@ public class StandardFlowRegistryDAO extends ComponentDAO implements FlowRegistr
final FlowRegistryClientNode registry = getFlowRegistryClient(registryId);
final LogRepository logRepository = new NopLogRepository();
- final ComponentLog configVerificationLog = new SimpleProcessLogger(registry, logRepository, new StandardLoggingContext());
+ final ComponentLog configVerificationLog = new StandardComponentLog(
+ registryId, registry, new StandardLoggingContext(), logRepository
+ );
final ExtensionManager extensionManager = flowController.getExtensionManager();
final Map<String, String> effectiveProperties = properties == null ? Collections.emptyMap() : properties;
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardParameterProviderDAO.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardParameterProviderDAO.java
index 1bf0196f375..57d218581e8 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardParameterProviderDAO.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardParameterProviderDAO.java
@@ -36,7 +36,7 @@ import org.apache.nifi.logging.repository.NopLogRepository;
import org.apache.nifi.nar.ExtensionManager;
import org.apache.nifi.parameter.ParameterGroupConfiguration;
import org.apache.nifi.parameter.ParameterLookup;
-import org.apache.nifi.processor.SimpleProcessLogger;
+import org.apache.nifi.processor.StandardComponentLog;
import org.apache.nifi.util.BundleUtils;
import org.apache.nifi.web.NiFiCoreException;
import org.apache.nifi.web.ResourceNotFoundException;
@@ -238,7 +238,9 @@ public class StandardParameterProviderDAO extends ComponentDAO implements Parame
final ParameterProviderNode parameterProviderNode = locateParameterProvider(parameterProviderId);
final LogRepository logRepository = new NopLogRepository();
- final ComponentLog configVerificationLog = new SimpleProcessLogger(parameterProviderNode.getParameterProvider(), logRepository, new StandardLoggingContext());
+ final ComponentLog configVerificationLog = new StandardComponentLog(
+ parameterProviderId, parameterProviderNode.getParameterProvider(), new StandardLoggingContext(), logRepository
+ );
final ExtensionManager extensionManager = flowController.getExtensionManager();
final ParameterLookup parameterLookup = ParameterLookup.EMPTY;
@@ -246,11 +248,9 @@ public class StandardParameterProviderDAO extends ComponentDAO implements Parame
parameterLookup, flowController.getControllerServiceProvider(), null);
final List<ConfigVerificationResult> verificationResults = parameterProviderNode.verifyConfiguration(configurationContext, configVerificationLog, extensionManager);
- final List<ConfigVerificationResultDTO> resultsDtos = verificationResults.stream()
+ return verificationResults.stream()
.map(this::createConfigVerificationResultDto)
.collect(Collectors.toList());
-
- return resultsDtos;
}
private ConfigVerificationResultDTO createConfigVerificationResultDto(final ConfigVerificationResult result) {
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardProcessorDAO.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardProcessorDAO.java
index 3b386f24463..35a5257d9f3 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardProcessorDAO.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardProcessorDAO.java
@@ -42,7 +42,7 @@ import org.apache.nifi.logging.repository.NopLogRepository;
import org.apache.nifi.nar.ExtensionManager;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.Relationship;
-import org.apache.nifi.processor.SimpleProcessLogger;
+import org.apache.nifi.processor.StandardComponentLog;
import org.apache.nifi.processor.StandardProcessContext;
import org.apache.nifi.scheduling.ExecutionNode;
import org.apache.nifi.scheduling.SchedulingStrategy;
@@ -510,16 +510,16 @@ public class StandardProcessorDAO extends ComponentDAO implements ProcessorDAO {
new NopStateManager(), () -> false, flowController);
final LogRepository logRepository = new NopLogRepository();
- final ComponentLog configVerificationLog = new SimpleProcessLogger(processor, logRepository, new StandardLoggingContext(processor));
+ final ComponentLog configVerificationLog = new StandardComponentLog(
+ processorId, processor, new StandardLoggingContext(processor), logRepository
+ );
final ExtensionManager extensionManager = flowController.getExtensionManager();
final List<ConfigVerificationResult> verificationResults = processor.verifyConfiguration(processContext, configVerificationLog, attributes, extensionManager,
processor.getProcessGroup().getParameterContext());
- final List<ConfigVerificationResultDTO> resultsDtos = verificationResults.stream()
+ return verificationResults.stream()
.map(this::createConfigVerificationResultDto)
.collect(Collectors.toList());
-
- return resultsDtos;
}
private ConfigVerificationResultDTO createConfigVerificationResultDto(final ConfigVerificationResult result) {
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardReportingTaskDAO.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardReportingTaskDAO.java
index 5b8ea81a3e6..dd87a204d3b 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardReportingTaskDAO.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardReportingTaskDAO.java
@@ -38,7 +38,7 @@ import org.apache.nifi.logging.StandardLoggingContext;
import org.apache.nifi.logging.repository.NopLogRepository;
import org.apache.nifi.nar.ExtensionManager;
import org.apache.nifi.parameter.ParameterLookup;
-import org.apache.nifi.processor.SimpleProcessLogger;
+import org.apache.nifi.processor.StandardComponentLog;
import org.apache.nifi.scheduling.SchedulingStrategy;
import org.apache.nifi.util.BundleUtils;
import org.apache.nifi.util.FormatUtils;
@@ -264,7 +264,9 @@ public class StandardReportingTaskDAO extends ComponentDAO implements ReportingT
final ReportingTaskNode taskNode = locateReportingTask(reportingTaskId);
final LogRepository logRepository = new NopLogRepository();
- final ComponentLog configVerificationLog = new SimpleProcessLogger(taskNode.getReportingTask(), logRepository, new StandardLoggingContext());
+ final ComponentLog configVerificationLog = new StandardComponentLog(
+ reportingTaskId, taskNode.getReportingTask(), new StandardLoggingContext(), logRepository
+ );
final ExtensionManager extensionManager = flowController.getExtensionManager();
final ParameterLookup parameterLookup = ParameterLookup.EMPTY;
@@ -272,11 +274,9 @@ public class StandardReportingTaskDAO extends ComponentDAO implements ReportingT
parameterLookup, flowController.getControllerServiceProvider(), null);
final List<ConfigVerificationResult> verificationResults = taskNode.verifyConfiguration(configurationContext, configVerificationLog, extensionManager);
- final List<ConfigVerificationResultDTO> resultsDtos = verificationResults.stream()
+ return verificationResults.stream()
.map(this::createConfigVerificationResultDto)
.collect(Collectors.toList());
-
- return resultsDtos;
}
private ConfigVerificationResultDTO createConfigVerificationResultDto(final ConfigVerificationResult result) {
diff --git a/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/engine/ComponentBuilder.java b/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/engine/ComponentBuilder.java
index bce59f06eec..0d3a5528fcc 100644
--- a/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/engine/ComponentBuilder.java
+++ b/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/engine/ComponentBuilder.java
@@ -61,7 +61,7 @@ import org.apache.nifi.parameter.ParameterProviderInitializationContext;
import org.apache.nifi.parameter.StandardParameterProviderInitializationContext;
import org.apache.nifi.processor.Processor;
import org.apache.nifi.processor.ProcessorInitializationContext;
-import org.apache.nifi.processor.SimpleProcessLogger;
+import org.apache.nifi.processor.StandardComponentLog;
import org.apache.nifi.processor.StandardProcessorInitializationContext;
import org.apache.nifi.processor.StandardValidationContextFactory;
import org.apache.nifi.registry.flow.FlowRegistryClient;
@@ -167,7 +167,7 @@ public class ComponentBuilder {
private LoggableComponent<FlowRegistryClient> createLoggableFlowRegistryClient() throws FlowRepositoryClientInstantiationException {
try {
- final ComponentLog componentLog = new SimpleProcessLogger(identifier, InMemoryFlowRegistry.class.getDeclaredConstructor().newInstance(), new StandardLoggingContext());
+ final ComponentLog componentLog = new StandardComponentLog(identifier, InMemoryFlowRegistry.class.getDeclaredConstructor().newInstance(), new StandardLoggingContext());
final TerminationAwareLogger terminationAwareLogger = new TerminationAwareLogger(componentLog);
final InMemoryFlowRegistry registryClient = new InMemoryFlowRegistry();
final LoggableComponent<FlowRegistryClient> nodeComponent = new LoggableComponent<>(registryClient, bundleCoordinate, terminationAwareLogger);
@@ -288,7 +288,7 @@ public class ComponentBuilder {
logger.info("Created Controller Service of type {} with identifier {}", type, identifier);
final StandardLoggingContext loggingContext = new StandardLoggingContext();
- final ComponentLog serviceLogger = new SimpleProcessLogger(identifier, serviceImpl, loggingContext);
+ final ComponentLog serviceLogger = new StandardComponentLog(identifier, serviceImpl, loggingContext);
final TerminationAwareLogger terminationAwareLogger = new TerminationAwareLogger(serviceLogger);
final StateManager stateManager = stateManagerProvider.getStateManager(identifier, rawClass);
@@ -356,7 +356,7 @@ public class ComponentBuilder {
Thread.currentThread().setContextClassLoader(detectedClassLoader);
final Object extensionInstance = rawClass.getDeclaredConstructor().newInstance();
- final ComponentLog componentLog = new SimpleProcessLogger(identifier, extensionInstance, loggingContext);
+ final ComponentLog componentLog = new StandardComponentLog(identifier, extensionInstance, loggingContext);
final TerminationAwareLogger terminationAwareLogger = new TerminationAwareLogger(componentLog);
final T cast = nodeType.cast(extensionInstance);
diff --git a/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/engine/StatelessReloadComponent.java b/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/engine/StatelessReloadComponent.java
index 3c8affe6c41..95f4518f812 100644
--- a/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/engine/StatelessReloadComponent.java
+++ b/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/engine/StatelessReloadComponent.java
@@ -43,7 +43,7 @@ import org.apache.nifi.nar.ExtensionManager;
import org.apache.nifi.nar.NarCloseable;
import org.apache.nifi.parameter.ParameterProvider;
import org.apache.nifi.processor.Processor;
-import org.apache.nifi.processor.SimpleProcessLogger;
+import org.apache.nifi.processor.StandardComponentLog;
import org.apache.nifi.processor.StandardProcessContext;
import org.apache.nifi.registry.flow.FlowRegistryClient;
import org.apache.nifi.registry.flow.FlowRegistryClientNode;
@@ -98,7 +98,7 @@ public class StatelessReloadComponent implements ReloadComponent {
}
// set the new processor in the existing node
- final ComponentLog componentLogger = new SimpleProcessLogger(id, newNode.getProcessor(), new StandardLoggingContext(newNode));
+ final ComponentLog componentLogger = new StandardComponentLog(id, newNode.getProcessor(), new StandardLoggingContext(newNode));
final TerminationAwareLogger terminationAwareLogger = new TerminationAwareLogger(componentLogger);
LogRepositoryFactory.getRepository(id).setLogger(terminationAwareLogger);
@@ -157,7 +157,7 @@ public class StatelessReloadComponent implements ReloadComponent {
invocationHandler.setServiceNode(existingNode);
// create LoggableComponents for the proxy and implementation
- final ComponentLog componentLogger = new SimpleProcessLogger(id, newNode.getControllerServiceImplementation(), new StandardLoggingContext(newNode));
+ final ComponentLog componentLogger = new StandardComponentLog(id, newNode.getControllerServiceImplementation(), new StandardLoggingContext(newNode));
final TerminationAwareLogger terminationAwareLogger = new TerminationAwareLogger(componentLogger);
LogRepositoryFactory.getRepository(id).setLogger(terminationAwareLogger);
@@ -205,7 +205,7 @@ public class StatelessReloadComponent implements ReloadComponent {
}
// set the new reporting task into the existing node
- final ComponentLog componentLogger = new SimpleProcessLogger(id, existingNode.getReportingTask(), new StandardLoggingContext());
+ final ComponentLog componentLogger = new StandardComponentLog(id, existingNode.getReportingTask(), new StandardLoggingContext());
final TerminationAwareLogger terminationAwareLogger = new TerminationAwareLogger(componentLogger);
LogRepositoryFactory.getRepository(id).setLogger(terminationAwareLogger);
@@ -250,7 +250,7 @@ public class StatelessReloadComponent implements ReloadComponent {
}
// set the new reporting task into the existing node
- final ComponentLog componentLogger = new SimpleProcessLogger(id, existingNode.getParameterProvider(), new StandardLoggingContext());
+ final ComponentLog componentLogger = new StandardComponentLog(id, existingNode.getParameterProvider(), new StandardLoggingContext());
final TerminationAwareLogger terminationAwareLogger = new TerminationAwareLogger(componentLogger);
LogRepositoryFactory.getRepository(id).setLogger(terminationAwareLogger);
@@ -288,7 +288,7 @@ public class StatelessReloadComponent implements ReloadComponent {
extensionManager.closeURLClassLoader(id, existingInstanceClassLoader);
// set the new flow registry client into the existing node
- final ComponentLog componentLogger = new SimpleProcessLogger(id, existingNode.getComponent(), new StandardLoggingContext());
+ final ComponentLog componentLogger = new StandardComponentLog(id, existingNode.getComponent(), new StandardLoggingContext());
final TerminationAwareLogger terminationAwareLogger = new TerminationAwareLogger(componentLogger);
LogRepositoryFactory.getRepository(id).setLogger(terminationAwareLogger);
diff --git a/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/engine/StatelessSchedulingAgent.java b/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/engine/StatelessSchedulingAgent.java
index 6724c569b59..1da9f628e19 100644
--- a/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/engine/StatelessSchedulingAgent.java
+++ b/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/engine/StatelessSchedulingAgent.java
@@ -25,7 +25,7 @@ import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.logging.StandardLoggingContext;
import org.apache.nifi.nar.ExtensionManager;
import org.apache.nifi.nar.NarCloseable;
-import org.apache.nifi.processor.SimpleProcessLogger;
+import org.apache.nifi.processor.StandardComponentLog;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -90,7 +90,7 @@ public class StatelessSchedulingAgent implements SchedulingAgent {
}
} catch (final Throwable t) {
- final ComponentLog componentLog = new SimpleProcessLogger(taskNode.getIdentifier(), taskNode.getReportingTask(), new StandardLoggingContext());
+ final ComponentLog componentLog = new StandardComponentLog(taskNode.getIdentifier(), taskNode.getReportingTask(), new StandardLoggingContext());
componentLog.error("Error running task {}", taskNode.getReportingTask(), t);
if (componentLog.isDebugEnabled()) {
componentLog.error("", t);