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 e3efe479d1d NIFI-15943 Streamlined log messages in
ParameterProviderSecretsManager (#11301)
e3efe479d1d is described below
commit e3efe479d1d1a8234f3e00e922ccadfc86947df2
Author: David Handermann <[email protected]>
AuthorDate: Mon Jun 1 15:55:05 2026 -0500
NIFI-15943 Streamlined log messages in ParameterProviderSecretsManager
(#11301)
---
.../secrets/ParameterProviderSecretsManager.java | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/components/connector/secrets/ParameterProviderSecretsManager.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/components/connector/secrets/ParameterProviderSecretsManager.java
index 37d7d5c5755..5547170e979 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/components/connector/secrets/ParameterProviderSecretsManager.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/components/connector/secrets/ParameterProviderSecretsManager.java
@@ -22,6 +22,7 @@ import org.apache.nifi.components.connector.SecretReference;
import org.apache.nifi.components.validation.ValidationStatus;
import org.apache.nifi.controller.ParameterProviderNode;
import org.apache.nifi.controller.flow.FlowManager;
+import org.apache.nifi.parameter.ParameterProvider;
import org.apache.nifi.util.FormatUtils;
import org.apache.nifi.util.NiFiProperties;
import org.slf4j.Logger;
@@ -117,9 +118,8 @@ public class ParameterProviderSecretsManager implements
SecretsManager {
if (providerId != null) {
final ValidationStatus priorWarnedStatus =
lastWarnedStatus.remove(providerId);
if (priorWarnedStatus != null) {
- logger.info("Parameter Provider [{}] (id={}) returned to
VALID after being logged as {};"
- + " SecretReferences backed by this
provider will resolve again",
- parameterProviderNode.getName(), providerId,
priorWarnedStatus);
+ final ParameterProvider parameterProvider =
parameterProviderNode.getParameterProvider();
+ logger.info("{} returned to VALID after being logged as
[{}] now resolving Secret References", parameterProvider, priorWarnedStatus);
}
}
providers.add(new
ParameterProviderSecretProvider(parameterProviderNode));
@@ -144,7 +144,7 @@ public class ParameterProviderSecretsManager implements
SecretsManager {
if (!cacheDuration.isZero()) {
final CachedSecret cached = secretCache.get(fqn);
if (cached != null && !isExpired(cached)) {
- logger.debug("Cache hit for secret [{}]", fqn);
+ logger.debug("Cached Secret found [{}]", fqn);
return Optional.ofNullable(cached.secret());
}
}
@@ -228,7 +228,7 @@ public class ParameterProviderSecretsManager implements
SecretsManager {
if (fqn != null) {
final CachedSecret cached = secretCache.get(fqn);
if (cached != null && !isExpired(cached)) {
- logger.debug("Cache hit for secret [{}]", fqn);
+ logger.debug("Cached Secret found [{}]", fqn);
results.put(secretReference, cached.secret());
continue;
}
@@ -307,9 +307,8 @@ public class ParameterProviderSecretsManager implements
SecretsManager {
return;
}
- logger.warn("Skipping Parameter Provider [{}] (id={}) as a Secret
Provider because its current validation status is {}; "
- + "SecretReferences backed by this provider will
resolve to null until it returns to VALID",
- parameterProviderNode.getName(), providerId, effectiveStatus);
+ final ParameterProvider parameterProvider =
parameterProviderNode.getParameterProvider();
+ logger.warn("{} skipped as a Secret Provider with validation status
[{}] resolving Secret References as null until VALID", parameterProvider,
effectiveStatus);
}
private SecretProvider findProvider(final SecretReference secretReference,
final Set<SecretProvider> providers) {