You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@bookkeeper.apache.org by GitBox <gi...@apache.org> on 2018/07/16 10:44:13 UTC

[GitHub] eolivelli commented on a change in pull request #1546: Issue 1538: Expose MetricsServer in http server

eolivelli commented on a change in pull request #1546: Issue 1538: Expose MetricsServer in http server
URL: https://github.com/apache/bookkeeper/pull/1546#discussion_r202639364
 
 

 ##########
 File path: bookkeeper-http/http-server/src/main/java/org/apache/bookkeeper/http/HttpRouter.java
 ##########
 @@ -29,74 +29,76 @@
  */
 public abstract class HttpRouter<Handler> {
 
-  // Define endpoints here.
-  public static final String HEARTBEAT                    = "/heartbeat";
-  public static final String SERVER_CONFIG                = "/api/v1/config/server_config";
+    // Define endpoints here.
+    public static final String HEARTBEAT                    = "/heartbeat";
+    public static final String SERVER_CONFIG                = "/api/v1/config/server_config";
+    public static final String METRICS                      = "/api/v1/config/metrics";
 
-  // ledger
-  public static final String DELETE_LEDGER                = "/api/v1/ledger/delete";
-  public static final String LIST_LEDGER                  = "/api/v1/ledger/list";
-  public static final String GET_LEDGER_META              = "/api/v1/ledger/metadata";
-  public static final String READ_LEDGER_ENTRY            = "/api/v1/ledger/read";
-  // bookie
-  public static final String LIST_BOOKIES                 = "/api/v1/bookie/list_bookies";
-  public static final String LIST_BOOKIE_INFO             = "/api/v1/bookie/list_bookie_info";
-  public static final String LAST_LOG_MARK                = "/api/v1/bookie/last_log_mark";
-  public static final String LIST_DISK_FILE               = "/api/v1/bookie/list_disk_file";
-  public static final String EXPAND_STORAGE               = "/api/v1/bookie/expand_storage";
-  // autorecovery
-  public static final String RECOVERY_BOOKIE              = "/api/v1/autorecovery/bookie";
-  public static final String LIST_UNDER_REPLICATED_LEDGER = "/api/v1/autorecovery/list_under_replicated_ledger";
-  public static final String WHO_IS_AUDITOR               = "/api/v1/autorecovery/who_is_auditor";
-  public static final String TRIGGER_AUDIT                = "/api/v1/autorecovery/trigger_audit";
-  public static final String LOST_BOOKIE_RECOVERY_DELAY   = "/api/v1/autorecovery/lost_bookie_recovery_delay";
-  public static final String DECOMMISSION                 = "/api/v1/autorecovery/decommission";
+    // ledger
+    public static final String DELETE_LEDGER                = "/api/v1/ledger/delete";
+    public static final String LIST_LEDGER                  = "/api/v1/ledger/list";
+    public static final String GET_LEDGER_META              = "/api/v1/ledger/metadata";
+    public static final String READ_LEDGER_ENTRY            = "/api/v1/ledger/read";
+    // bookie
+    public static final String LIST_BOOKIES                 = "/api/v1/bookie/list_bookies";
+    public static final String LIST_BOOKIE_INFO             = "/api/v1/bookie/list_bookie_info";
+    public static final String LAST_LOG_MARK                = "/api/v1/bookie/last_log_mark";
+    public static final String LIST_DISK_FILE               = "/api/v1/bookie/list_disk_file";
+    public static final String EXPAND_STORAGE               = "/api/v1/bookie/expand_storage";
+    // autorecovery
+    public static final String RECOVERY_BOOKIE              = "/api/v1/autorecovery/bookie";
+    public static final String LIST_UNDER_REPLICATED_LEDGER = "/api/v1/autorecovery/list_under_replicated_ledger";
+    public static final String WHO_IS_AUDITOR               = "/api/v1/autorecovery/who_is_auditor";
+    public static final String TRIGGER_AUDIT                = "/api/v1/autorecovery/trigger_audit";
+    public static final String LOST_BOOKIE_RECOVERY_DELAY   = "/api/v1/autorecovery/lost_bookie_recovery_delay";
+    public static final String DECOMMISSION                 = "/api/v1/autorecovery/decommission";
 
 
-  private final Map<String, Handler> endpointHandlers = new HashMap<>();
+    private final Map<String, Handler> endpointHandlers = new HashMap<>();
 
-  public HttpRouter(AbstractHttpHandlerFactory<Handler> handlerFactory) {
-    this.endpointHandlers.put(HEARTBEAT, handlerFactory.newHandler(HttpServer.ApiType.HEARTBEAT));
-    this.endpointHandlers.put(SERVER_CONFIG, handlerFactory.newHandler(HttpServer.ApiType.SERVER_CONFIG));
+    public HttpRouter(AbstractHttpHandlerFactory<Handler> handlerFactory) {
+        this.endpointHandlers.put(HEARTBEAT, handlerFactory.newHandler(HttpServer.ApiType.HEARTBEAT));
+        this.endpointHandlers.put(SERVER_CONFIG, handlerFactory.newHandler(HttpServer.ApiType.SERVER_CONFIG));
+        this.endpointHandlers.put(METRICS, handlerFactory.newHandler(HttpServer.ApiType.METRICS));
 
 Review comment:
   I have found, this is the real fix.
   Can we add tests ?

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services