Track Enclave API metrics

Consensys · May 12, 2019 · bd4d42d · bd4d42d
1 parent e19e49a
commit bd4d42d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/server/jersey-server/src/main/java/com/quorum/tessera/server/JerseyServer.java b/server/jersey-server/src/main/java/com/quorum/tessera/server/JerseyServer.java
@@ -9,7 +9,6 @@
 import com.quorum.tessera.server.monitoring.InfluxDbClient;
 import com.quorum.tessera.server.monitoring.InfluxDbPublisher;
 import com.quorum.tessera.server.monitoring.MetricsResource;
-import com.quorum.tessera.server.monitoring.MonitoringNotSupportedException;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.glassfish.jersey.server.ResourceConfig;
@@ -109,10 +108,6 @@ public void start() throws Exception {
     }
 
     private void startInfluxMonitoring() {
-        if(!supportsMonitoring(type)) {
-            throw new MonitoringNotSupportedException(type);
-        }
-
         InfluxDbClient influxDbClient = new InfluxDbClient(uri, influxConfig, type);
         Runnable publisher = new InfluxDbPublisher(influxDbClient);
 
@@ -129,13 +124,6 @@ private void startInfluxMonitoring() {
         this.executor.scheduleWithFixedDelay(exceptionSafePublisher, delayInSecs, delayInSecs, TimeUnit.SECONDS);
     }
 
-    private boolean supportsMonitoring(AppType appType) {
-        return AppType.P2P.equals(appType) ||
-               AppType.Q2T.equals(appType) ||
-               AppType.ADMIN.equals(appType) ||
-               AppType.THIRD_PARTY.equals(appType);
-    }
-
     @Override
     public void stop() {
         LOGGER.info("Stopping Jersey server at {}", uri);

diff --git a/server/jersey-server/src/main/java/com/quorum/tessera/server/monitoring/MetricsEnquirer.java b/server/jersey-server/src/main/java/com/quorum/tessera/server/monitoring/MetricsEnquirer.java
@@ -55,6 +55,9 @@ private Set<ObjectName> getTesseraResourceMBeanNames(AppType appType) throws Mal
             case THIRD_PARTY:
                 type = "ThirdPartyRestApp";
                 break;
+            case ENCLAVE:
+                type = "EnclaveApplication";
+                break;
             default:
                 throw new MonitoringNotSupportedException(appType);
         }