Merge pull request #7 from kenfinnigan/fixes

Add some additional debugging

Author: kenfinnigan

src/main/java/com/redhat/MeterController.java

@@ -259,6 +259,8 @@ PodWatcher getWatcher() {
     private MeterStatus constructStatus() {
         final String currentlyWatching = podWatcher != null ? "TRUE" : "FALSE";
         final String watchedPodCount = podWatcher != null ? podWatcher.watchedPods() : "UNKNOWN";
+        // TODO remove
+        System.out.println("WATCHED POD STATUS: " + watchedPodCount);
         final Resource<ServiceMonitor> serviceMonitor = serviceMonitor();
         final String serviceMonitorInstalled = serviceMonitor != null ? (serviceMonitor.get() != null ? "TRUE" : "FALSE") : "UNKNOWN";
         return new MeterStatus(currentlyWatching, watchedPodCount, serviceMonitorInstalled);

src/main/java/com/redhat/PodWatcher.java

@@ -11,6 +11,8 @@
 import java.util.function.ToDoubleFunction;
 import java.util.stream.Collectors;
 
+import org.jboss.logging.Logger;
+
 import io.fabric8.kubernetes.api.model.Pod;
 import io.fabric8.kubernetes.api.model.PodList;
 import io.fabric8.kubernetes.api.model.Quantity;
@@ -24,6 +26,8 @@
 import io.micrometer.core.instrument.Tags;
 
 class PodWatcher implements Watcher<Pod> {
+    private static final Logger LOG = Logger.getLogger(PodWatcher.class);
+
     private final KubernetesClient client;
     private final MeterRegistry meterRegistry;
     private final OperatorConfig config;
@@ -56,6 +60,7 @@ static Map<String, String> convertListToMap(List<String> productNameMapAsList) {
 
     @Override
     public void eventReceived(Action action, Pod resource) {
+        LOG.info("EVENT RECEIVED FOR POD: " + resource.getMetadata().getName());
         if (!shouldWatch(spec.getWatchNamespaces(), resource.getMetadata().getNamespace())) {
             // If we're not watching all namespaces or the event is from a namespace we're not watching, do nothing
             return;
@@ -113,7 +118,8 @@ public void onClose(WatcherException cause) {
     }
 
     Boolean shouldWatch(Set<String> watchingNamespaces, String namespace) {
-        return watchingNamespaces.isEmpty() || watchingNamespaces.contains(namespace);
+        return watchingNamespaces.isEmpty() || watchingNamespaces.contains(namespace)
+            || watchingNamespaces.contains("");
     }
 
     static Boolean isInfrastructure(OperatorConfig config, Map<String, String> podLabels) {
@@ -150,7 +156,7 @@ void updateSpec(MeterSpec newSpec) {
 
         PodList pods = client.pods().inAnyNamespace().list();
         for (Pod pod : pods.getItems()) {
-            if (!(newSpec.getWatchNamespaces().isEmpty() || newSpec.getWatchNamespaces().contains(pod.getMetadata().getNamespace()))) {
+            if (!shouldWatch(newSpec.getWatchNamespaces(), pod.getMetadata().getNamespace())) {
                 // If we're not watching all namespaces or the event is from a namespace we're not watching, do nothing
                 continue;
             }
@@ -187,6 +193,8 @@ String watchedPods() {
         for (PodGroup podGroup : metrics.values()) {
             count += podGroup.pods.size();
         }
+        //TODO remove
+        System.out.println("NUMBER OF WATCHED PODS: " + count);
         return Integer.toString(count);
     }
 

src/test/java/com/redhat/PodInclusionTest.java

@@ -49,6 +49,11 @@ void testNamespaceWatchedWithEmptyWatches() {
         assertTrue(podWatcher.shouldWatch(Collections.emptySet(), "test"));
     }
 
+    @Test
+    void testNamespaceWatchedWithEmptyWatch() {
+        assertTrue(podWatcher.shouldWatch(Set.of(""), "test"));
+    }
+
     @Test
     void testNamespaceWatchedWithDefinedWatches() {
         assertTrue(podWatcher.shouldWatch(Set.of("another", "test"), "test"));