8000 refactor: simplify EvenMonitor methods · smsilva/java-operator-sdk@24d0902 · GitHub
[go: up one dir, main page]

Skip to content

Commit 24d0902

Browse files
committed
refactor: simplify EvenMonitor methods
1 parent 0c30922 commit 24d0902

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

micrometer-support/src/main/java/io/javaoperatorsdk/operator/monitoring/micrometer/MicrometerMetrics.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
import io.javaoperatorsdk.operator.api.monitoring.EventMonitor;
77
import io.javaoperatorsdk.operator.api.monitoring.Metrics;
8-
import io.javaoperatorsdk.operator.processing.event.CustomResourceID;
98
import io.javaoperatorsdk.operator.processing.event.Event;
109
import io.micrometer.core.instrument.MeterRegistry;
1110
import io.micrometer.core.instrument.Timer;
@@ -16,12 +15,12 @@ public class MicrometerMetrics implements Metrics {
1615
private final MeterRegistry registry;
1716
private final EventMonitor monitor = new EventMonitor() {
1817
@Override
19-
public void processedEvent(CustomResourceID uid, Event event) {
18+
public void processedEvent(Event event) {
2019
incrementProcessedEventsNumber();
2120
}
2221

2322
@Override
24-
public void failedEvent(CustomResourceID uid, Event event) {
23+
public void failedEvent(Event event) {
2524
incrementControllerRetriesNumber();
2625
}
2726
};
Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
package io.javaoperatorsdk.operator.api.monitoring;
22

3-
import io.javaoperatorsdk.operator.processing.event.CustomResourceID;
43
import io.javaoperatorsdk.operator.processing.event.Event;
54

65
public interface EventMonitor {
76

87
EventMonitor NOOP = new EventMonitor() {
98
@Override
10-
public void processedEvent(CustomResourceID uid, Event event) {}
9+
public void processedEvent(Event event) {}
1110

1211
@Override
13-
public void failedEvent(CustomResourceID uid, Event event) {}
12+
public void failedEvent(Event event) {}
1413
};
1514

16-
void processedEvent(CustomResourceID uid, Event event);
15+
void processedEvent(Event event);
1716

18-
void failedEvent(CustomResourceID uid, Event event);
17+
void failedEvent(Event event);
1918
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public void handleEvent(Event event) {
103103
}
104104
final var monitor = monitor();
105105
final var resourceID = event.getRelatedCustomResourceID();
106-
monitor.processedEvent(resourceID, event);
106+
monitor.processedEvent(event);
107107

108108
handleEventMarking(event);
109109
if (!eventMarker.deleteEventPresent(resourceID)) {
@@ -180,7 +180,7 @@ void eventProcessingFinished(
180180
if (isRetryConfigured() && postExecutionControl.exceptionDuringExecution() &&
181181
!eventMarker.deleteEventPresent(customResourceID)) {
182182
handleRetryOnException(executionScope);
183-
monitor().failedEvent(customResourceID, executionScope.getTriggeringEvent());
183+
monitor().failedEvent(executionScope.getTriggeringEvent());
184184
return;
185185
}
186186
cleanupOnSuccessfulExecution(executionScope);

0 commit comments

Comments
 (0)
0