Skip to content

Commit c5d828e

Browse files
committed
feat: improve logging
1 parent 6c77b48 commit c5d828e

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/AbstractDependentResource.java

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ public ReconcileResult<R> reconcile(P primary, Context<P> context) {
3333
if (maybeActual.isEmpty()) {
3434
if (creatable) {
3535
var desired = desired(primary, context);
36-
log.info("Creating {} for primary {}", desired.getClass().getSimpleName(),
37-
ResourceID.fromResource(primary));
38-
log.debug("Creating dependent {} for primary {}", desired, primary);
36+
logForOperation("Creating", primary, desired);
3937
var createdResource = handleCreate(desired, primary, context);
4038
return ReconcileResult.resourceCreated(createdResource);
4139
}
@@ -45,9 +43,7 @@ public ReconcileResult<R> reconcile(P primary, Context<P> context) {
4543
final var match = updater.match(actual, primary, context);
4644
if (!match.matched()) {
4745
final var desired = match.computedDesired().orElse(desired(primary, context));
48-
log.info("Updating {} for primary {}", desired.getClass().getSimpleName(),
49-
ResourceID.fromResource(primary));
50-
log.debug("Updating dependent {} for primary {}", desired, primary);
46+
logForOperation("Updating", primary, desired);
5147
var updatedResource = handleUpdate(actual, desired, primary, context);
5248
return ReconcileResult.resourceUpdated(updatedResource);
5349
}
@@ -63,6 +59,15 @@ public ReconcileResult<R> reconcile(P primary, Context<P> context) {
6359
return ReconcileResult.noOperation(maybeActual.orElse(null));
6460
}
6561

62+
private void logForOperation(String operation, P primary, R desired) {
63+
final var desiredDesc = desired instanceof HasMetadata
64+
? "'" + ((HasMetadata) desired).getMetadata().getName() + "' "
65+
+ ((HasMetadata) desired).getKind()
66+
: desired.getClass().getSimpleName();
67+
log.info("{} {} for primary {}", operation, desiredDesc, ResourceID.fromResource(primary));
68+
log.debug("{} dependent {} for primary {}", operation, desired, primary);
69+
}
70+
6671
protected R handleCreate(R desired, P primary, Context<P> context) {
6772
ResourceID resourceID = ResourceID.fromResource(primary);
6873
R created = creator.create(desired, primary, context);

0 commit comments

Comments
 (0)