NMS-17727: Refactor grpc client

features/grpc/exporter/src/main/java/org/opennms/features/grpc/exporter/GrpcExporter.java → features/grpc/exporter/src/main/java/org/opennms/features/grpc/exporter/GrpcClient.java

@@ -34,21 +34,21 @@
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-public abstract class GrpcExporter {
+public abstract class GrpcClient {
 
-    private static final Logger LOG = LoggerFactory.getLogger(GrpcExporter.class);
+    private static final Logger LOG = LoggerFactory.getLogger(GrpcClient.class);
 
-    private String host;
-    private String tlsCertPath;
-    private boolean tlsEnabled;
+    private final String host;
+    private final String tlsCertPath;
+    private final boolean tlsEnabled;
     private ManagedChannel channel;
-    private ClientInterceptor clientInterceptor;
+    private final ClientInterceptor clientInterceptor;
     private final AtomicBoolean stopped = new AtomicBoolean(false);
 
-    public GrpcExporter(final String host,
-                        final String tlsCertPath,
-                        final boolean tlsEnabled,
-                        ClientInterceptor clientInterceptor) {
+    public GrpcClient(final String host,
+                      final String tlsCertPath,
+                      final boolean tlsEnabled,
+                      ClientInterceptor clientInterceptor) {
         this.host = Objects.requireNonNull(host);
         this.tlsCertPath = tlsCertPath;
         this.tlsEnabled = tlsEnabled;

features/grpc/exporter/src/main/java/org/opennms/features/grpc/exporter/bsm/BsmGrpcClient.java

@@ -27,7 +27,7 @@
 import io.grpc.ConnectivityState;
 import io.grpc.stub.StreamObserver;
 import org.opennms.features.grpc.exporter.Callback;
-import org.opennms.features.grpc.exporter.GrpcExporter;
+import org.opennms.features.grpc.exporter.GrpcClient;
 import org.opennms.features.grpc.exporter.NamedThreadFactory;
 import org.opennms.plugin.grpc.proto.services.InventoryUpdateList;
 import org.opennms.plugin.grpc.proto.services.ServiceSyncGrpc;
@@ -43,7 +43,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 
-public class BsmGrpcClient extends GrpcExporter {
+public class BsmGrpcClient extends GrpcClient {
     private static final Logger LOG = LoggerFactory.getLogger(BsmGrpcClient.class);
 
     public static final String FOREIGN_TYPE = "OpenNMS";
@@ -54,6 +54,7 @@ public class BsmGrpcClient extends GrpcExporter {
     private ScheduledExecutorService scheduler;
     private final AtomicBoolean reconnecting = new AtomicBoolean(false);
     private Callback inventoryCallback;
+    private boolean enabled = true;
 
 
     public BsmGrpcClient(final String host,
@@ -66,11 +67,24 @@ public BsmGrpcClient(final String host,
     }
 
     public void start() throws SSLException {
+        if (!enabled) {
+            LOG.info("BSM GrpcExporterClient disabled, not starting connections to {}", super.getHost());
+            return;
+        }
+
         super.startGrpcConnection();
         this.monitoredServiceSyncStub = ServiceSyncGrpc.newStub(super.getChannel());
         connectStreams();
         LOG.info("BSM GrpcExporterClient started to {}", super.getHost());
     }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    public boolean isEnabled() {
+        return enabled;
+    }
 
     public void stop() {
         if (scheduler != null) {

features/grpc/exporter/src/main/java/org/opennms/features/grpc/exporter/events/bsm/InventoryEventHandler.java → features/grpc/exporter/src/main/java/org/opennms/features/grpc/exporter/bsm/InventoryEventHandler.java

@@ -20,12 +20,12 @@
  * License.
  */
 
-package org.opennms.features.grpc.exporter.events.bsm;
+package org.opennms.features.grpc.exporter.bsm;
 
-import org.opennms.features.grpc.exporter.bsm.InventoryService;
-import org.opennms.features.grpc.exporter.common.MonitoredServiceWithMetadata;
-import org.opennms.features.grpc.exporter.events.EventConstants;
+
+import org.opennms.features.grpc.exporter.mapper.MonitoredServiceWithMetadata;
 import org.opennms.integration.api.v1.dao.NodeDao;
+import org.opennms.netmgt.events.api.EventConstants;
 import org.opennms.netmgt.events.api.EventListener;
 import org.opennms.netmgt.events.api.EventSubscriptionService;
 import org.opennms.netmgt.events.api.model.IEvent;

features/grpc/exporter/src/main/java/org/opennms/features/grpc/exporter/bsm/InventoryService.java

@@ -24,7 +24,7 @@
 
 import org.opennms.core.utils.SystemInfoUtils;
 import org.opennms.features.grpc.exporter.NamedThreadFactory;
-import org.opennms.features.grpc.exporter.common.MonitoredServiceWithMetadata;
+import org.opennms.features.grpc.exporter.mapper.MonitoredServiceWithMetadata;
 import org.opennms.features.grpc.exporter.mapper.MonitoredServiceMapper;
 import org.opennms.integration.api.v1.dao.NodeDao;
 import org.opennms.integration.api.v1.runtime.RuntimeInfo;
@@ -85,11 +85,19 @@ public void stop() {
     }
 
     public void sendAddService(final MonitoredServiceWithMetadata service) {
+        if (!client.isEnabled()) {
+            LOG.debug("BSM service disabled, not sending updates");
+            return;
+        }
         final var inventory = MonitoredServiceMapper.INSTANCE.toInventoryUpdates(List.of(service), this.runtimeInfo, false);
         this.client.sendMonitoredServicesInventoryUpdate(inventory);
     }
 
     public void sendSnapshot() {
+        if (!client.isEnabled()) {
+            LOG.debug("BSM service disabled, not sending snapshot");
+            return;
+        }
         final var services = this.nodeDao.getNodes().stream()
                 .flatMap(node -> node.getIpInterfaces().stream()
                         .flatMap(iface -> iface.getMonitoredServices().stream()
@@ -101,6 +109,11 @@ public void sendSnapshot() {
     }
 
     public void sendHeartBeatUpdate() {
+        if (!client.isEnabled()) {
+            LOG.debug("BSM service disabled, not sending heartbeat");
+            return;
+        }
+
         this.client.sendHeartBeatUpdate(org.opennms.plugin.grpc.proto.services.HeartBeat.newBuilder()
                 .setMonitoringInstance(org.opennms.plugin.grpc.proto.services.MonitoringInstance.newBuilder()
                         .setInstanceId(runtimeInfo.getSystemId())

features/grpc/exporter/src/main/java/org/opennms/features/grpc/exporter/events/bsm/StateEventHandler.java → features/grpc/exporter/src/main/java/org/opennms/features/grpc/exporter/bsm/StateEventHandler.java

@@ -20,12 +20,11 @@
  * License.
  */
 
-package org.opennms.features.grpc.exporter.events.bsm;
+package org.opennms.features.grpc.exporter.bsm;
 
-import org.opennms.features.grpc.exporter.bsm.StateService;
-import org.opennms.features.grpc.exporter.common.MonitoredServiceWithMetadata;
-import org.opennms.features.grpc.exporter.events.EventConstants;
+import org.opennms.features.grpc.exporter.mapper.MonitoredServiceWithMetadata;
 import org.opennms.integration.api.v1.dao.NodeDao;
+import org.opennms.netmgt.events.api.EventConstants;
 import org.opennms.netmgt.events.api.EventListener;
 import org.opennms.netmgt.events.api.EventSubscriptionService;
 import org.opennms.netmgt.events.api.model.IEvent;

features/grpc/exporter/src/main/java/org/opennms/features/grpc/exporter/bsm/StateService.java

@@ -22,7 +22,7 @@
 
 package org.opennms.features.grpc.exporter.bsm;
 
-import org.opennms.features.grpc.exporter.common.MonitoredServiceWithMetadata;
+import org.opennms.features.grpc.exporter.mapper.MonitoredServiceWithMetadata;
 import org.opennms.features.grpc.exporter.mapper.MonitoredServiceMapper;
 import org.opennms.integration.api.v1.dao.NodeDao;
 import org.opennms.integration.api.v1.runtime.RuntimeInfo;
@@ -47,11 +47,19 @@ public StateService(final NodeDao nodeDao,
     }
 
     public void sendState(final List<MonitoredServiceWithMetadata> services) {
+        if (!client.isEnabled()) {
+            LOG.debug("BSM service disabled, not sending state updates");
+            return;
+        }
         final var updates = MonitoredServiceMapper.INSTANCE.toStateUpdates(services, this.runtimeInfo);
         this.client.sendMonitoredServicesStatusUpdate(updates);
     }
 
     public void sendAllState() {
+        if (!client.isEnabled()) {
+            LOG.debug("BSM service disabled, not sending all state");
+            return;
+        }
         final var services = this.nodeDao.getNodes().stream()
                 .flatMap(node -> node.getIpInterfaces().stream()
                         .flatMap(iface -> iface.getMonitoredServices().stream()

features/grpc/exporter/src/main/java/org/opennms/features/grpc/exporter/commands/InventorySnapshot.java → features/grpc/exporter/src/main/java/org/opennms/features/grpc/exporter/commands/InventorySnapshotCommand.java

@@ -30,7 +30,7 @@
 
 @Command(scope = "opennms", name = "grpc-exporter-send-inventory-snapshot", description = "Send an inventory snapshot")
 @Service
-public class InventorySnapshot implements Action {
+public class InventorySnapshotCommand implements Action {
 
     @Reference
     private InventoryService inventoryService;

features/grpc/exporter/src/main/java/org/opennms/features/grpc/exporter/commands/State.java → features/grpc/exporter/src/main/java/org/opennms/features/grpc/exporter/commands/SendServiceStateCommand.java

@@ -30,7 +30,7 @@
 
 @Command(scope = "opennms", name = "grpc-exporter-send-state", description = "Send all current  monitor service states")
 @Service
-public class State implements Action {
+public class SendServiceStateCommand implements Action {
 
     @Reference
     private StateService stateService;