wip

Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

Author: csviri

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

@@ -62,8 +62,8 @@ public class MicrometerMetricsV2 implements Metrics {
 
   public static final String RECONCILIATION_EXECUTION_DURATION =
       RECONCILIATIONS + "execution.duration";
-  public static final String NO_NAMESPACE = "NO_NAMESPACE";
-  public static final String UNKNOWN_ACTION = "UNKNOWN";
+  public static final String NO_NAMESPACE_TAG = "no_namespace";
+  public static final String UNKNOWN_ACTION_TAG = "unknown";
 
   private final MeterRegistry registry;
   private final Map<String, AtomicInteger> gauges = new ConcurrentHashMap<>();
@@ -182,7 +182,7 @@ public void eventReceived(Event event, Map<String, Object> metadata) {
           null,
           metadata,
           Tag.of(EVENT, event.getClass().getSimpleName()),
-          Tag.of(ACTION, UNKNOWN_ACTION));
+          Tag.of(ACTION, UNKNOWN_ACTION_TAG));
     }
   }
 
@@ -254,7 +254,7 @@ private void addNamespaceTag(String namespace, List<Tag> tags) {
       if (namespace != null && !namespace.isBlank()) {
         addTag(NAMESPACE, namespace, tags);
       } else {
-        addTag(NAMESPACE, NO_NAMESPACE, tags);
+        addTag(NAMESPACE, NO_NAMESPACE_TAG, tags);
       }
     }
   }

sample-operators/metrics-processing/src/main/java/io/javaoperatorsdk/operator/sample/metrics/MetricsHandlingReconciler1.java

@@ -15,14 +15,42 @@
  */
 package io.javaoperatorsdk.operator.sample.metrics;
 
+import java.util.List;
+
+import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
+import io.javaoperatorsdk.operator.api.reconciler.EventSourceContext;
+import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
+import io.javaoperatorsdk.operator.processing.event.ResourceID;
+import io.javaoperatorsdk.operator.processing.event.source.EventSource;
+import io.javaoperatorsdk.operator.processing.event.source.timer.TimerEventSource;
 import io.javaoperatorsdk.operator.sample.metrics.customresource.MetricsHandlingCustomResource1;
 
 @ControllerConfiguration
 public class MetricsHandlingReconciler1
     extends AbstractMetricsHandlingReconciler<MetricsHandlingCustomResource1> {
 
+  private static final long TIMER_DELAY = 5000;
+
+  private final TimerEventSource<MetricsHandlingCustomResource1> timerEventSource;
+
   public MetricsHandlingReconciler1() {
     super(100);
+    timerEventSource = new TimerEventSource<>();
+  }
+
+  @SuppressWarnings("unchecked")
+  @Override
+  public List<EventSource<?, MetricsHandlingCustomResource1>> prepareEventSources(
+      EventSourceContext<MetricsHandlingCustomResource1> context) {
+    return List.of((EventSource) timerEventSource);
+  }
+
+  @Override
+  public UpdateControl<MetricsHandlingCustomResource1> reconcile(
+      MetricsHandlingCustomResource1 resource, Context<MetricsHandlingCustomResource1> context) {
+    var result = super.reconcile(resource, context);
+    timerEventSource.scheduleOnce(ResourceID.fromResource(resource), TIMER_DELAY);
+    return result;
   }
 }

sample-operators/metrics-processing/src/main/java/io/javaoperatorsdk/operator/sample/metrics/MetricsHandlingSampleOperator.java

@@ -123,7 +123,7 @@ public Duration step() {
     new ProcessorMetrics().bindTo(compositeRegistry);
     new UptimeMetrics().bindTo(compositeRegistry);
 
-    return MicrometerMetricsV2.newBuilder(compositeRegistry).build();
+    return MicrometerMetricsV2.newBuilder(compositeRegistry).withNamespaceAsTag().build();
   }
 
   @SuppressWarnings("unchecked")

sample-operators/metrics-processing/src/test/java/io/javaoperatorsdk/operator/sample/metrics/MetricsHandlingE2E.java

@@ -18,6 +18,7 @@
 import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.ArrayDeque;
@@ -226,24 +227,41 @@ private void verifyPrometheusMetrics() {
         "reconciliations_execution_duration_milliseconds_count",
         Duration.ofSeconds(30));
 
+    // Verify timer event source events are recorded with "no_namespace" tag
+    // Timer events are not ResourceEvents so they have no namespace
+    assertMetricPresent(
+        prometheusUrl,
+        "events_received_total{namespace=\"no_namespace\"}",
+        Duration.ofSeconds(30),
+        "events_received_total",
+        "no_namespace");
+
     log.info("All metrics verified successfully in Prometheus");
   }
 
   private void assertMetricPresent(String prometheusUrl, String metricName, Duration timeout) {
+    assertMetricPresent(prometheusUrl, metricName, timeout, metricName);
+  }
+
+  private void assertMetricPresent(
+      String prometheusUrl, String query, Duration timeout, String... expectedSubstrings) {
     await()
         .atMost(timeout)
         .pollInterval(Duration.ofSeconds(5))
         .untilAsserted(
             () -> {
-              String result = queryPrometheus(prometheusUrl, metricName);
-              log.info("{}: {}", metricName, result);
+              String result = queryPrometheus(prometheusUrl, query);
+              log.info("{}: {}", query, result);
               assertThat(result).contains("\"status\":\"success\"");
-              assertThat(result).contains(metricName);
+              for (String expected : expectedSubstrings) {
+                assertThat(result).contains(expected);
+              }
             });
   }
 
   private String queryPrometheus(String prometheusUrl, String query) throws IOException {
-    String urlString = prometheusUrl + "/api/v1/query?query=" + query;
+    String urlString =
+        prometheusUrl + "/api/v1/query?query=" + URLEncoder.encode(query, StandardCharsets.UTF_8);
     URL url = new URL(urlString);
     HttpURLConnection connection = (HttpURLConnection) url.openConnection();
     connection.setRequestMethod("GET");