Skip to content

NIFI-15943 Streamline log messages in ParameterProviderSecretsManager #11301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pvillard31 merged 1 commit into from
Jun 1, 2026
+7 −8
Merged

NIFI-15943 Streamline log messages in ParameterProviderSecretsManager #11301

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions ...in/java/org/apache/nifi/components/connector/secrets/ParameterProviderSecretsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
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;
Expand Down Expand Up @@ -117,9 +118,8 @@ public Set<SecretProvider> getSecretProviders() {
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));
Expand All @@ -144,7 +144,7 @@ public Optional<Secret> getSecret(final SecretReference secretReference) {
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());
}
}
Expand Down Expand Up @@ -228,7 +228,7 @@ private Map<SecretReference, Secret> fetchSecretsWithCache(final Set<SecretRefer
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;
}
Expand Down Expand Up @@ -307,9 +307,8 @@ private void logSkippedInvalidProvider(final ParameterProviderNode parameterProv
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) {
Expand Down
Loading