Disable Prometheus HTTP endpoint when the port is specified to zero i…

…n Scalar DB server (#260)
scalar-labs · Aug 3, 2021 · 2b15a58 · 2b15a58
1 parent 0ce3b53
commit 2b15a58
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 4 deletions.
diff --git a/...ava/com/scalar/db/server/ConsensusCommitWithDistributedStorageServiceIntegrationTest.java b/...ava/com/scalar/db/server/ConsensusCommitWithDistributedStorageServiceIntegrationTest.java
@@ -18,6 +18,7 @@
 import com.scalar.db.api.TableMetadata;
 import com.scalar.db.config.DatabaseConfig;
 import com.scalar.db.io.DataType;
+import com.scalar.db.server.config.ServerConfig;
 import com.scalar.db.storage.jdbc.test.TestEnv;
 import com.scalar.db.storage.rpc.GrpcConfig;
 import com.scalar.db.storage.rpc.GrpcStorage;
@@ -106,7 +107,9 @@ public static void setUpBeforeClass() throws Exception {
     testEnv.createTables();
     testEnv.insertMetadata();
 
-    server = new ScalarDbServer(testEnv.getJdbcConfig().getProperties());
+    Properties serverProperties = new Properties(testEnv.getJdbcConfig().getProperties());
+    serverProperties.setProperty(ServerConfig.PROMETHEUS_HTTP_ENDPOINT_PORT, "0");
+    server = new ScalarDbServer(serverProperties);
     server.start();
 
     Properties properties = new Properties();

diff --git a/...gration-test/java/com/scalar/db/server/DistributedStorageAdminServiceIntegrationTest.java b/...gration-test/java/com/scalar/db/server/DistributedStorageAdminServiceIntegrationTest.java
@@ -5,6 +5,7 @@
 import com.scalar.db.api.TableMetadata;
 import com.scalar.db.config.DatabaseConfig;
 import com.scalar.db.io.DataType;
+import com.scalar.db.server.config.ServerConfig;
 import com.scalar.db.storage.AdminIntegrationTestBase;
 import com.scalar.db.storage.jdbc.test.TestEnv;
 import com.scalar.db.storage.rpc.GrpcAdmin;
@@ -58,7 +59,9 @@ public static void setUpBeforeClass() throws Exception {
     testEnv.createMetadataTable();
     testEnv.insertMetadata();
 
-    server = new ScalarDbServer(testEnv.getJdbcConfig().getProperties());
+    Properties serverProperties = new Properties(testEnv.getJdbcConfig().getProperties());
+    serverProperties.setProperty(ServerConfig.PROMETHEUS_HTTP_ENDPOINT_PORT, "0");
+    server = new ScalarDbServer(serverProperties);
     server.start();
 
     Properties properties = new Properties();

diff --git a/.../integration-test/java/com/scalar/db/server/DistributedStorageServiceIntegrationTest.java b/.../integration-test/java/com/scalar/db/server/DistributedStorageServiceIntegrationTest.java
@@ -13,6 +13,7 @@
 import com.scalar.db.config.DatabaseConfig;
 import com.scalar.db.io.DataType;
 import com.scalar.db.io.Key;
+import com.scalar.db.server.config.ServerConfig;
 import com.scalar.db.storage.IntegrationTestBase;
 import com.scalar.db.storage.jdbc.test.TestEnv;
 import com.scalar.db.storage.rpc.GrpcConfig;
@@ -116,7 +117,9 @@ public static void setUpBeforeClass() throws Exception {
     testEnv.createTables();
     testEnv.insertMetadata();
 
-    server = new ScalarDbServer(testEnv.getJdbcConfig().getProperties());
+    Properties serverProperties = new Properties(testEnv.getJdbcConfig().getProperties());
+    serverProperties.setProperty(ServerConfig.PROMETHEUS_HTTP_ENDPOINT_PORT, "0");
+    server = new ScalarDbServer(serverProperties);
     server.start();
 
     Properties properties = new Properties();

diff --git a/...com/scalar/db/server/DistributedTransactionServiceWithConsensusCommitIntegrationTest.java b/...com/scalar/db/server/DistributedTransactionServiceWithConsensusCommitIntegrationTest.java
@@ -33,6 +33,7 @@
 import com.scalar.db.io.DataType;
 import com.scalar.db.io.IntValue;
 import com.scalar.db.io.Key;
+import com.scalar.db.server.config.ServerConfig;
 import com.scalar.db.storage.jdbc.test.TestEnv;
 import com.scalar.db.storage.rpc.GrpcConfig;
 import com.scalar.db.transaction.consensuscommit.Coordinator;
@@ -1135,6 +1136,7 @@ public static void setUpBeforeClass() throws Exception {
     testEnv.insertMetadata();
 
     Properties serverProperties = new Properties(testEnv.getJdbcConfig().getProperties());
+    serverProperties.setProperty(ServerConfig.PROMETHEUS_HTTP_ENDPOINT_PORT, "0");
     server = new ScalarDbServer(serverProperties);
     server.start();
 

diff --git a/.../server/DistributedTransactionServiceWithConsensusCommitWithExtraReadIntegrationTest.java b/.../server/DistributedTransactionServiceWithConsensusCommitWithExtraReadIntegrationTest.java
@@ -36,6 +36,7 @@
 import com.scalar.db.exception.transaction.TransactionException;
 import com.scalar.db.io.DataType;
 import com.scalar.db.io.IntValue;
+import com.scalar.db.server.config.ServerConfig;
 import com.scalar.db.storage.jdbc.test.TestEnv;
 import com.scalar.db.storage.rpc.GrpcConfig;
 import com.scalar.db.transaction.consensuscommit.Coordinator;
@@ -295,6 +296,7 @@ public static void setUpBeforeClass() throws Exception {
     Properties serverProperties = new Properties(testEnv.getJdbcConfig().getProperties());
     serverProperties.setProperty(DatabaseConfig.ISOLATION_LEVEL, "SERIALIZABLE");
     serverProperties.setProperty(DatabaseConfig.SERIALIZABLE_STRATEGY, "EXTRA_READ");
+    serverProperties.setProperty(ServerConfig.PROMETHEUS_HTTP_ENDPOINT_PORT, "0");
     server = new ScalarDbServer(serverProperties);
     server.start();
 

diff --git a/...server/DistributedTransactionServiceWithConsensusCommitWithExtraWriteIntegrationTest.java b/...server/DistributedTransactionServiceWithConsensusCommitWithExtraWriteIntegrationTest.java
@@ -36,6 +36,7 @@
 import com.scalar.db.exception.transaction.TransactionException;
 import com.scalar.db.io.DataType;
 import com.scalar.db.io.IntValue;
+import com.scalar.db.server.config.ServerConfig;
 import com.scalar.db.storage.jdbc.test.TestEnv;
 import com.scalar.db.storage.rpc.GrpcConfig;
 import com.scalar.db.transaction.consensuscommit.Coordinator;
@@ -255,6 +256,7 @@ public static void setUpBeforeClass() throws Exception {
     Properties serverProperties = new Properties(testEnv.getJdbcConfig().getProperties());
     serverProperties.setProperty(DatabaseConfig.ISOLATION_LEVEL, "SERIALIZABLE");
     serverProperties.setProperty(DatabaseConfig.SERIALIZABLE_STRATEGY, "EXTRA_WRITE");
+    serverProperties.setProperty(ServerConfig.PROMETHEUS_HTTP_ENDPOINT_PORT, "0");
     server = new ScalarDbServer(serverProperties);
     server.start();
 

diff --git a/...com/scalar/db/server/DistributedTransactionServiceWithJdbcTransactionIntegrationTest.java b/...com/scalar/db/server/DistributedTransactionServiceWithJdbcTransactionIntegrationTest.java
@@ -15,6 +15,7 @@
 import com.scalar.db.io.DataType;
 import com.scalar.db.io.IntValue;
 import com.scalar.db.io.Key;
+import com.scalar.db.server.config.ServerConfig;
 import com.scalar.db.storage.jdbc.test.TestEnv;
 import com.scalar.db.storage.rpc.GrpcConfig;
 import com.scalar.db.transaction.rpc.GrpcTransaction;
@@ -327,6 +328,7 @@ public static void setUpBeforeClass() throws Exception {
 
     Properties serverProperties = new Properties(testEnv.getJdbcConfig().getProperties());
     serverProperties.setProperty(DatabaseConfig.TRANSACTION_MANAGER, "jdbc");
+    serverProperties.setProperty(ServerConfig.PROMETHEUS_HTTP_ENDPOINT_PORT, "0");
     server = new ScalarDbServer(serverProperties);
     server.start();
 

diff --git a/server/src/main/java/com/scalar/db/server/service/ServerModule.java b/server/src/main/java/com/scalar/db/server/service/ServerModule.java
@@ -78,16 +78,22 @@ private void startJmxReporter(MetricRegistry metricRegistry) {
   }
 
   private void startPrometheusHttpEndpoint(MetricRegistry metricRegistry) {
+    int prometheusHttpEndpointPort = config.getPrometheusHttpEndpointPort();
+    if (prometheusHttpEndpointPort == 0) {
+      return;
+    }
+
     CollectorRegistry.defaultRegistry.register(new DropwizardExports(metricRegistry));
 
-    Server server = new Server(config.getPrometheusHttpEndpointPort());
+    Server server = new Server(prometheusHttpEndpointPort);
     ServletContextHandler context = new ServletContextHandler();
     context.setContextPath("/");
     server.setHandler(context);
     context.addServlet(new ServletHolder(new MetricsServlet()), "/metrics");
     server.setStopAtShutdown(true);
     try {
       server.start();
+      LOGGER.info("Prometheus HTTP endpoint started, listening on {}", prometheusHttpEndpointPort);
     } catch (Exception e) {
       LOGGER.error("failed to start Jetty server", e);
     }