Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix metrics

Browse Source
This commit is contained in:
Athou
2021-01-30 22:40:31 +01:00
parent d7858f17a1
commit b45219a595
4 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pom.xml
View File

@@ -313,8 +313,14 @@
<dependency> <dependency>
<groupId>io.dropwizard.metrics</groupId> <groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-graphite</artifactId> <artifactId>metrics-graphite</artifactId>
<version>3.1.2</version> <version>4.0.5</version>
</dependency> </dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-json</artifactId>
<version>4.0.5</version>
</dependency>
<dependency> <dependency>
<groupId>javax.xml.bind</groupId> <groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId> <artifactId>jaxb-api</artifactId>

4
src/main/app/templates/_metrics.meter.html
View File

@@ -2,10 +2,10 @@
<span>{{label}}</span> <span>{{label}}</span>
<dl class="dl-horizontal"> <dl class="dl-horizontal">
<dt>Mean</dt> <dt>Mean</dt>
<dd>{{metric.meanRate | number:2}}</dd> <dd>{{metric.mean_rate | number:2}}</dd>
<dt>1/5/15 min</dt> <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> <dt>Total</dt>
<dd>{{metric.count}}</dd> <dd>{{metric.count}}</dd>

6
src/main/app/templates/_metrics.timer.html
View File

@@ -2,16 +2,16 @@
<span>{{label}}</span> <span>{{label}}</span>
<dl class="dl-horizontal"> <dl class="dl-horizontal">
<dt>Mean</dt> <dt>Mean</dt>
<dd>{{metric.meanRate | number:2}}</dd> <dd>{{metric.mean_rate | number:2}}</dd>
<dt>1/5/15 min</dt> <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> <dt>Total</dt>
<dd>{{metric.count}}</dd> <dd>{{metric.count}}</dd>
<dt>min/max/mean (ms)</dt> <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> </dl>
</div> </div>

4
src/main/java/com/commafeed/CommaFeedApplication.java
View File

@@ -5,6 +5,7 @@ import java.util.Date;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import javax.servlet.DispatcherType; import javax.servlet.DispatcherType;
import javax.servlet.FilterChain; import javax.servlet.FilterChain;
@@ -15,6 +16,7 @@ import javax.servlet.http.HttpServletRequest;
import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.AvailableSettings;
import com.codahale.metrics.json.MetricsModule;
import com.commafeed.backend.feed.FeedRefreshTaskGiver; import com.commafeed.backend.feed.FeedRefreshTaskGiver;
import com.commafeed.backend.feed.FeedRefreshUpdater; import com.commafeed.backend.feed.FeedRefreshUpdater;
import com.commafeed.backend.feed.FeedRefreshWorker; import com.commafeed.backend.feed.FeedRefreshWorker;
@@ -77,6 +79,8 @@ public class CommaFeedApplication extends Application<CommaFeedConfiguration> {
@Override @Override
public void initialize(Bootstrap<CommaFeedConfiguration> bootstrap) { 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, bootstrap.addBundle(hibernateBundle = new HibernateBundle<CommaFeedConfiguration>(AbstractModel.class, Feed.class,
FeedCategory.class, FeedEntry.class, FeedEntryContent.class, FeedEntryStatus.class, FeedEntryTag.class, FeedCategory.class, FeedEntry.class, FeedEntryContent.class, FeedEntryStatus.class, FeedEntryTag.class,
FeedSubscription.class, User.class, UserRole.class, UserSettings.class) { FeedSubscription.class, User.class, UserRole.class, UserSettings.class) {