From b45219a595d34df9bd0c550e6b679c0f17b8416c Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Sat, 30 Jan 2021 22:40:31 +0100
Subject: [PATCH] fix metrics

---
 pom.xml                                               | 8 +++++++-
 src/main/app/templates/_metrics.meter.html            | 4 ++--
 src/main/app/templates/_metrics.timer.html            | 6 +++---
 src/main/java/com/commafeed/CommaFeedApplication.java | 4 ++++
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 39f80878..1a67e390 100644
--- a/pom.xml
+++ b/pom.xml
@@ -313,8 +313,14 @@
 		<dependency>
 			<groupId>io.dropwizard.metrics</groupId>
 			<artifactId>metrics-graphite</artifactId>
-			<version>3.1.2</version>
+			<version>4.0.5</version>
 		</dependency>
+		<dependency>
+			<groupId>io.dropwizard.metrics</groupId>
+			<artifactId>metrics-json</artifactId>
+			<version>4.0.5</version>
+		</dependency>
+
 		<dependency>
 			<groupId>javax.xml.bind</groupId>
 			<artifactId>jaxb-api</artifactId>
diff --git a/src/main/app/templates/_metrics.meter.html b/src/main/app/templates/_metrics.meter.html
index 585d1386..a05402dc 100644
--- a/src/main/app/templates/_metrics.meter.html
+++ b/src/main/app/templates/_metrics.meter.html
@@ -2,10 +2,10 @@
 	<span>{{label}}</span>
 	<dl class="dl-horizontal">
 		<dt>Mean</dt>
-		<dd>{{metric.meanRate | number:2}}</dd>
+		<dd>{{metric.mean_rate | number:2}}</dd>
 
 		<dt>1/5/15 min</dt>
-		<dd>{{metric.oneMinuteRate | number:2}} {{metric.fiveMinuteRate | number:2}} {{metric.fifteenMinuteRate | number:2}}</dd>
+		<dd>{{metric.m1_rate | number:2}} {{metric.m5_rate | number:2}} {{metric.m15_rate | number:2}}</dd>
 
 		<dt>Total</dt>
 		<dd>{{metric.count}}</dd>
diff --git a/src/main/app/templates/_metrics.timer.html b/src/main/app/templates/_metrics.timer.html
index 638997f6..c84f499b 100644
--- a/src/main/app/templates/_metrics.timer.html
+++ b/src/main/app/templates/_metrics.timer.html
@@ -2,16 +2,16 @@
 	<span>{{label}}</span>
 	<dl class="dl-horizontal">
 		<dt>Mean</dt>
-		<dd>{{metric.meanRate | number:2}}</dd>
+		<dd>{{metric.mean_rate | number:2}}</dd>
 
 		<dt>1/5/15 min</dt>
-		<dd>{{metric.oneMinuteRate | number:2}} {{metric.fiveMinuteRate | number:2}} {{metric.fifteenMinuteRate | number:2}}</dd>
+		<dd>{{metric.m1_rate | number:2}} {{metric.m5_rate | number:2}} {{metric.m15_rate | number:2}}</dd>
 
 		<dt>Total</dt>
 		<dd>{{metric.count}}</dd>
 		
 		<dt>min/max/mean (ms)</dt>
-		<dd>{{metric.snapshot.min/1000000 | number:0}} {{metric.snapshot.max/1000000 | number:0}} {{metric.snapshot.mean/1000000 | number:0}}</dd>
+		<dd>{{metric.min/1000000 | number:0}} {{metric.max/1000000 | number:0}} {{metric.mean/1000000 | number:0}}</dd>
 
 	</dl>
 </div>
\ No newline at end of file
diff --git a/src/main/java/com/commafeed/CommaFeedApplication.java b/src/main/java/com/commafeed/CommaFeedApplication.java
index 551b75a4..24467580 100644
--- a/src/main/java/com/commafeed/CommaFeedApplication.java
+++ b/src/main/java/com/commafeed/CommaFeedApplication.java
@@ -5,6 +5,7 @@ import java.util.Date;
 import java.util.EnumSet;
 import java.util.Set;
 import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 
 import javax.servlet.DispatcherType;
 import javax.servlet.FilterChain;
@@ -15,6 +16,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.hibernate.cfg.AvailableSettings;
 
+import com.codahale.metrics.json.MetricsModule;
 import com.commafeed.backend.feed.FeedRefreshTaskGiver;
 import com.commafeed.backend.feed.FeedRefreshUpdater;
 import com.commafeed.backend.feed.FeedRefreshWorker;
@@ -77,6 +79,8 @@ public class CommaFeedApplication extends Application<CommaFeedConfiguration> {
 
 	@Override
 	public void initialize(Bootstrap<CommaFeedConfiguration> bootstrap) {
+		bootstrap.getObjectMapper().registerModule(new MetricsModule(TimeUnit.SECONDS, TimeUnit.SECONDS, false));
+
 		bootstrap.addBundle(hibernateBundle = new HibernateBundle<CommaFeedConfiguration>(AbstractModel.class, Feed.class,
 				FeedCategory.class, FeedEntry.class, FeedEntryContent.class, FeedEntryStatus.class, FeedEntryTag.class,
 				FeedSubscription.class, User.class, UserRole.class, UserSettings.class) {