use codahale metrics library instead of our own

src/main/java/com/commafeed/frontend/pages/BasePage.java

@@ -15,7 +15,6 @@ import org.apache.wicket.markup.html.TransparentWebMarkupContainer;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.WebPage;
 
-import com.commafeed.backend.StartupBean;
 import com.commafeed.backend.dao.FeedCategoryDAO;
 import com.commafeed.backend.dao.FeedDAO;
 import com.commafeed.backend.dao.FeedEntryDAO;
@@ -29,6 +28,7 @@ import com.commafeed.backend.model.User;
 import com.commafeed.backend.model.UserSettings;
 import com.commafeed.backend.services.ApplicationSettingsService;
 import com.commafeed.backend.services.MailService;
+import com.commafeed.backend.startup.StartupBean;
 import com.commafeed.frontend.CommaFeedSession;
 import com.commafeed.frontend.utils.WicketUtils;
 import com.google.common.collect.Maps;

src/main/java/com/commafeed/frontend/pages/DemoLoginPage.java

@@ -4,8 +4,8 @@ import javax.inject.Inject;
 
 import org.apache.wicket.markup.html.WebPage;
 
-import com.commafeed.backend.StartupBean;
 import com.commafeed.backend.services.UserService;
+import com.commafeed.backend.startup.StartupBean;
 import com.commafeed.frontend.CommaFeedSession;
 
 public class DemoLoginPage extends WebPage {

src/main/java/com/commafeed/frontend/rest/resources/AbstractREST.java

@@ -24,6 +24,8 @@ import org.apache.wicket.protocol.http.servlet.ServletWebResponse;
 import org.apache.wicket.request.cycle.RequestCycle;
 import org.apache.wicket.util.crypt.Base64;
 
+import com.codahale.metrics.Meter;
+import com.codahale.metrics.MetricRegistry;
 import com.commafeed.backend.dao.UserDAO;
 import com.commafeed.backend.model.User;
 import com.commafeed.backend.model.UserRole.Role;
@@ -42,6 +44,9 @@ public abstract class AbstractREST {
 	@Context
 	private HttpServletResponse response;
 
+	@Inject
+	MetricRegistry metrics;
+
 	@Inject
 	private UserDAO userDAO;
 
@@ -93,10 +98,14 @@ public abstract class AbstractREST {
 	}
 
 	@AroundInvoke
-	public Object checkSecurity(InvocationContext context) throws Exception {
+	public Object intercept(InvocationContext context) throws Exception {
+		Method method = context.getMethod();
+		handleMetric(method);
+
+		// check security
 		boolean allowed = true;
 		User user = null;
-		Method method = context.getMethod();
+
 		SecurityCheck check = method.isAnnotationPresent(SecurityCheck.class) ? method.getAnnotation(SecurityCheck.class) : method
 				.getDeclaringClass().getAnnotation(SecurityCheck.class);
 
@@ -121,6 +130,11 @@ public abstract class AbstractREST {
 		return context.proceed();
 	}
 
+	private void handleMetric(Method method) {
+		Meter callCount = metrics.meter(MetricRegistry.name(method.getDeclaringClass(), method.getName(), "callCount"));
+		callCount.mark();
+	}
+
 	private boolean checkRole(Role requiredRole) {
 		if (requiredRole == Role.NONE) {
 			return true;

src/main/java/com/commafeed/frontend/rest/resources/AdminREST.java

@@ -17,9 +17,7 @@ import javax.ws.rs.core.Response.Status;
 
 import org.apache.commons.lang.StringUtils;
 
-import com.commafeed.backend.DatabaseCleaner;
-import com.commafeed.backend.MetricsBean;
-import com.commafeed.backend.StartupBean;
+import com.codahale.metrics.MetricRegistry;
 import com.commafeed.backend.dao.FeedDAO;
 import com.commafeed.backend.dao.FeedDAO.DuplicateMode;
 import com.commafeed.backend.dao.UserDAO;
@@ -33,14 +31,17 @@ import com.commafeed.backend.model.User;
 import com.commafeed.backend.model.UserRole;
 import com.commafeed.backend.model.UserRole.Role;
 import com.commafeed.backend.services.ApplicationSettingsService;
+import com.commafeed.backend.services.DatabaseCleaningService;
 import com.commafeed.backend.services.FeedService;
 import com.commafeed.backend.services.PasswordEncryptionService;
 import com.commafeed.backend.services.UserService;
+import com.commafeed.backend.startup.StartupBean;
 import com.commafeed.frontend.SecurityCheck;
 import com.commafeed.frontend.model.FeedCount;
 import com.commafeed.frontend.model.UserModel;
 import com.commafeed.frontend.model.request.FeedMergeRequest;
 import com.commafeed.frontend.model.request.IDRequest;
+import com.commafeed.frontend.rest.PrettyPrint;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -70,10 +71,10 @@ public class AdminREST extends AbstractREST {
 	FeedDAO feedDAO;
 
 	@Inject
-	MetricsBean metricsBean;
+	MetricRegistry metrics;
 
 	@Inject
-	DatabaseCleaner cleaner;
+	DatabaseCleaningService cleaner;
 
 	@Inject
 	FeedRefreshWorker feedRefreshWorker;
@@ -227,20 +228,8 @@ public class AdminREST extends AbstractREST {
 	@Path("/metrics")
 	@GET
 	@ApiOperation(value = "Retrieve server metrics")
-	public Response getMetrics(@QueryParam("backlog") @DefaultValue("false") boolean backlog) {
-		Map<String, Object> map = Maps.newLinkedHashMap();
-		map.put("lastMinute", metricsBean.getLastMinute());
-		map.put("lastHour", metricsBean.getLastHour());
-		if (backlog) {
-			map.put("backlog", taskGiver.getUpdatableCount());
-		}
-		map.put("http_active", feedRefreshWorker.getActiveCount());
-		map.put("http_queue", feedRefreshWorker.getQueueSize());
-		map.put("database_active", feedRefreshUpdater.getActiveCount());
-		map.put("database_queue", feedRefreshUpdater.getQueueSize());
-		map.put("cache", metricsBean.getCacheStats());
-
-		return Response.ok(map).build();
+	public Response getMetrics() {
+		return Response.ok(metrics).build();
 	}
 
 	@Path("/cleanup/feeds")

src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java

@@ -37,7 +37,6 @@ import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
 
-import com.commafeed.backend.StartupBean;
 import com.commafeed.backend.cache.CacheService;
 import com.commafeed.backend.dao.FeedCategoryDAO;
 import com.commafeed.backend.dao.FeedEntryStatusDAO;
@@ -47,8 +46,6 @@ import com.commafeed.backend.feeds.FeedFetcher;
 import com.commafeed.backend.feeds.FeedRefreshTaskGiver;
 import com.commafeed.backend.feeds.FeedUtils;
 import com.commafeed.backend.feeds.FetchedFeed;
-import com.commafeed.backend.feeds.OPMLExporter;
-import com.commafeed.backend.feeds.OPMLImporter;
 import com.commafeed.backend.model.Feed;
 import com.commafeed.backend.model.FeedCategory;
 import com.commafeed.backend.model.FeedEntryStatus;
@@ -56,9 +53,12 @@ import com.commafeed.backend.model.FeedSubscription;
 import com.commafeed.backend.model.UserRole.Role;
 import com.commafeed.backend.model.UserSettings.ReadingMode;
 import com.commafeed.backend.model.UserSettings.ReadingOrder;
+import com.commafeed.backend.opml.OPMLExporter;
+import com.commafeed.backend.opml.OPMLImporter;
 import com.commafeed.backend.services.ApplicationSettingsService;
 import com.commafeed.backend.services.FeedEntryService;
 import com.commafeed.backend.services.FeedSubscriptionService;
+import com.commafeed.backend.startup.StartupBean;
 import com.commafeed.frontend.SecurityCheck;
 import com.commafeed.frontend.model.Entries;
 import com.commafeed.frontend.model.Entry;

src/main/java/com/commafeed/frontend/rest/resources/PubSubHubbubCallbackREST.java

@@ -3,6 +3,7 @@ package com.commafeed.frontend.rest.resources;
 import java.util.Date;
 import java.util.List;
 
+import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.Consumes;
@@ -22,7 +23,8 @@ import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 
-import com.commafeed.backend.MetricsBean;
+import com.codahale.metrics.Meter;
+import com.codahale.metrics.MetricRegistry;
 import com.commafeed.backend.dao.FeedDAO;
 import com.commafeed.backend.feeds.FeedParser;
 import com.commafeed.backend.feeds.FeedRefreshTaskGiver;
@@ -52,8 +54,13 @@ public class PubSubHubbubCallbackREST extends AbstractREST {
 	@Inject
 	ApplicationSettingsService applicationSettingsService;
 
-	@Inject
-	MetricsBean metricsBean;
+	private Meter pushReceived;
+
+	@PostConstruct
+	public void initMetrics() {
+		pushReceived = metrics.meter(MetricRegistry.name(getClass(), "pushReceived"));
+
+	}
 
 	@Path("/callback")
 	@GET
@@ -119,7 +126,7 @@ public class PubSubHubbubCallbackREST extends AbstractREST {
 				log.debug("pushing content to queue for {}", feed.getUrl());
 				taskGiver.add(feed, false);
 			}
-			metricsBean.pushReceived(feeds.size());
+			pushReceived.mark();
 
 		} catch (Exception e) {
 			log.error("Could not parse pubsub callback: " + e.getMessage());

src/main/java/com/commafeed/frontend/rest/resources/ServerREST.java

@@ -10,10 +10,10 @@ import javax.ws.rs.core.Response.Status;
 
 import com.commafeed.backend.HttpGetter;
 import com.commafeed.backend.HttpGetter.HttpResult;
-import com.commafeed.backend.StartupBean;
 import com.commafeed.backend.feeds.FeedUtils;
 import com.commafeed.backend.services.ApplicationPropertiesService;
 import com.commafeed.backend.services.ApplicationSettingsService;
+import com.commafeed.backend.startup.StartupBean;
 import com.commafeed.frontend.model.ServerInfo;
 import com.wordnik.swagger.annotations.Api;
 import com.wordnik.swagger.annotations.ApiOperation;

src/main/java/com/commafeed/frontend/rest/resources/UserREST.java

@@ -11,7 +11,6 @@ import javax.ws.rs.core.Response.Status;
 
 import org.apache.commons.lang.StringUtils;
 
-import com.commafeed.backend.StartupBean;
 import com.commafeed.backend.dao.UserDAO;
 import com.commafeed.backend.dao.UserRoleDAO;
 import com.commafeed.backend.dao.UserSettingsDAO;
@@ -25,6 +24,7 @@ import com.commafeed.backend.model.UserSettings.ViewMode;
 import com.commafeed.backend.services.ApplicationSettingsService;
 import com.commafeed.backend.services.PasswordEncryptionService;
 import com.commafeed.backend.services.UserService;
+import com.commafeed.backend.startup.StartupBean;
 import com.commafeed.frontend.SecurityCheck;
 import com.commafeed.frontend.model.Settings;
 import com.commafeed.frontend.model.UserModel;