Skip to content

Commit 14c9339

Browse files
authored
Revert "feature: modified events logic"
This reverts commit 34f9d63.
1 parent b83efe4 commit 14c9339

File tree

2 files changed

+12
-13
lines changed

2 files changed

+12
-13
lines changed

Diff for: operator-framework-core/src/main/java/io/javaoperatorsdk/operator/Metrics.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ public <R extends CustomResource> UpdateControl<R> timeControllerCreateOrUpdate(
3636
.register(registry);
3737
try {
3838
final var result = timer.record(() -> controller.createOrUpdateResource(resource, context));
39-
System.out.println("I am here in create update");
4039
String successType = "cr";
4140
if (result.isUpdateStatusSubResource()) {
4241
successType = "status";
@@ -48,6 +47,9 @@ public <R extends CustomResource> UpdateControl<R> timeControllerCreateOrUpdate(
4847
.counter(
4948
"operator.sdk.controllers.execution.success", "controller", name, "type", successType)
5049
.increment();
50+
registry
51+
.counter("operator.sdk.events.received", "events", name, "type", "totalEvents")
52+
.increment();
5153
return result;
5254
} catch (Exception e) {
5355
registry
@@ -58,6 +60,9 @@ public <R extends CustomResource> UpdateControl<R> timeControllerCreateOrUpdate(
5860
"exception",
5961
e.getClass().getSimpleName())
6062
.increment();
63+
registry
64+
.counter("operator.sdk.events.received", "events", name, "exception", "totalEvents")
65+
.increment();
6166
throw e;
6267
}
6368
}
@@ -76,7 +81,6 @@ public DeleteControl timeControllerDelete(
7681
.register(registry);
7782
try {
7883
final var result = timer.record(() -> controller.deleteResource(resource, context));
79-
System.out.println("I am here in delete");
8084
String successType = "notDelete";
8185
if (result == DeleteControl.DEFAULT_DELETE) {
8286
successType = "delete";
@@ -85,6 +89,9 @@ public DeleteControl timeControllerDelete(
8589
.counter(
8690
"operator.sdk.controllers.execution.success", "controller", name, "type", successType)
8791
.increment();
92+
registry
93+
.counter("operator.sdk.events.received", "events", name, "type", "totalEvents")
94+
.increment();
8895
return result;
8996
} catch (Exception e) {
9097
registry
@@ -95,6 +102,9 @@ public DeleteControl timeControllerDelete(
95102
"exception",
96103
e.getClass().getSimpleName())
97104
.increment();
105+
registry
106+
.counter("operator.sdk.events.received", "events", name, "exception", "totalEvents")
107+
.increment();
98108
throw e;
99109
}
100110
}
@@ -109,16 +119,6 @@ public void timeControllerRetry() {
109119

110120
}
111121

112-
public void timeControllerEvents() {
113-
114-
registry
115-
.counter(
116-
"operator.sdk.total.events.received", "events", "totalEvents", "type",
117-
"eventsReceived")
118-
.increment();
119-
120-
}
121-
122122
public static class NoopMeterRegistry extends MeterRegistry {
123123
public NoopMeterRegistry(Clock clock) {
124124
super(clock);

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

-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ public void handleEvent(Event event) {
116116
final Predicate<CustomResource> selector = event.getCustomResourcesSelector();
117117
for (String uid : eventSourceManager.getLatestResourceUids(selector)) {
118118
eventBuffer.addEvent(uid, event);
119-
metrics.timeControllerEvents();
120119
executeBufferedEvents(uid);
121120
}
122121
} finally {

0 commit comments

Comments
 (0)