Skip to content

[WIP] improve: micrometer metrics improvements #3164

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

Draft
csviri wants to merge 1 commit into
base: next
Choose a base branch
from
+25 −15
Draft

[WIP] improve: micrometer metrics improvements #3164

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
40 changes: 25 additions & 15 deletions ...rt/src/main/java/io/javaoperatorsdk/operator/monitoring/micrometer/MicrometerMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;

import org.jspecify.annotations.NonNull;

import io.fabric8.kubernetes.api.model.HasMetadata;
import io.javaoperatorsdk.operator.OperatorException;
import io.javaoperatorsdk.operator.api.monitoring.Metrics;
Expand All @@ -37,8 +39,6 @@
import io.micrometer.core.instrument.Tag;
import io.micrometer.core.instrument.Timer;

import static io.javaoperatorsdk.operator.api.reconciler.Constants.CONTROLLER_NAME;

public class MicrometerMetrics implements Metrics {

private static final String PREFIX = "operator.sdk.";
Expand All @@ -48,8 +48,8 @@ public class MicrometerMetrics implements Metrics {
private static final String RECONCILIATIONS_RETRIES_LAST = RECONCILIATIONS + "retries.last";
private static final String RECONCILIATIONS_RETRIES_NUMBER = RECONCILIATIONS + "retries.number";
private static final String RECONCILIATIONS_STARTED = RECONCILIATIONS + "started";
private static final String RECONCILIATIONS_EXECUTIONS = PREFIX + RECONCILIATIONS + "executions.";
private static final String RECONCILIATIONS_QUEUE_SIZE = PREFIX + RECONCILIATIONS + "queue.size.";
private static final String RECONCILIATIONS_EXECUTIONS = PREFIX + RECONCILIATIONS + "executions";
private static final String RECONCILIATIONS_QUEUE_SIZE = PREFIX + RECONCILIATIONS + "queue.size";
private static final String NAME = "name";
private static final String NAMESPACE = "namespace";
private static final String GROUP = "group";
Expand All @@ -59,6 +59,7 @@ public class MicrometerMetrics implements Metrics {
private static final String METADATA_PREFIX = "resource.";
private static final String CONTROLLERS_EXECUTION = "controllers.execution.";
private static final String CONTROLLER = "controller";
private static final String CONTROLLER_NAME = CONTROLLER + ".name";
private static final String SUCCESS_SUFFIX = ".success";
private static final String FAILURE_SUFFIX = ".failure";
private static final String TYPE = "type";
Expand Down Expand Up @@ -130,18 +131,27 @@ private MicrometerMetrics(
public void controllerRegistered(Controller<? extends HasMetadata> controller) {
final var configuration = controller.getConfiguration();
final var name = configuration.getName();
final var executingThreadsName = RECONCILIATIONS_EXECUTIONS + name;
final var executingThreadsRefName = reconciliationExecutionGaugeRefName(name);
final var resourceClass = configuration.getResourceClass();
final var tags = new ArrayList<Tag>(3);
final var tags = new ArrayList<Tag>();
tags.add(Tag.of(CONTROLLER_NAME, name));
addGVKTags(GroupVersionKind.gvkFor(resourceClass), tags, false);
AtomicInteger executingThreads =
registry.gauge(executingThreadsName, tags, new AtomicInteger(0));
gauges.put(executingThreadsName, executingThreads);
registry.gauge(RECONCILIATIONS_EXECUTIONS, tags, new AtomicInteger(0));
gauges.put(executingThreadsRefName, executingThreads);

final var controllerQueueName = RECONCILIATIONS_QUEUE_SIZE + name;
final var controllerQueueRefName = controllerQueueSizeGaugeRefName(name);
AtomicInteger controllerQueueSize =
registry.gauge(controllerQueueName, tags, new AtomicInteger(0));
gauges.put(controllerQueueName, controllerQueueSize);
registry.gauge(RECONCILIATIONS_QUEUE_SIZE, tags, new AtomicInteger(0));
gauges.put(controllerQueueRefName, controllerQueueSize);
}

private static @NonNull String reconciliationExecutionGaugeRefName(String controllerName) {
return RECONCILIATIONS_EXECUTIONS + "." + controllerName;
}

private static @NonNull String controllerQueueSizeGaugeRefName(String controllerName) {
return RECONCILIATIONS_QUEUE_SIZE + "." + controllerName;
}

@Override
Expand Down Expand Up @@ -223,7 +233,7 @@ public void reconcileCustomResource(
String.valueOf(retryInfo.map(RetryInfo::isLastAttempt).orElse(true))));

var controllerQueueSize =
gauges.get(RECONCILIATIONS_QUEUE_SIZE + metadata.get(CONTROLLER_NAME));
gauges.get(controllerQueueSizeGaugeRefName(metadata.get(CONTROLLER_NAME).toString()));
controllerQueueSize.incrementAndGet();
}

Expand All @@ -235,18 +245,18 @@ public void finishedReconciliation(HasMetadata resource, Map<String, Object> met
@Override
public void reconciliationExecutionStarted(HasMetadata resource, Map<String, Object> metadata) {
var reconcilerExecutions =
gauges.get(RECONCILIATIONS_EXECUTIONS + metadata.get(CONTROLLER_NAME));
gauges.get(reconciliationExecutionGaugeRefName(metadata.get(CONTROLLER_NAME).toString()));
reconcilerExecutions.incrementAndGet();
}

@Override
public void reconciliationExecutionFinished(HasMetadata resource, Map<String, Object> metadata) {
var reconcilerExecutions =
gauges.get(RECONCILIATIONS_EXECUTIONS + metadata.get(CONTROLLER_NAME));
gauges.get(reconciliationExecutionGaugeRefName(metadata.get(CONTROLLER_NAME).toString()));
reconcilerExecutions.decrementAndGet();

var controllerQueueSize =
gauges.get(RECONCILIATIONS_QUEUE_SIZE + metadata.get(CONTROLLER_NAME));
gauges.get(controllerQueueSizeGaugeRefName(metadata.get(CONTROLLER_NAME).toString()));
controllerQueueSize.decrementAndGet();
}

Expand Down