Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Minor] Allow overriding time granularity in MetricPolicy

This commit is contained in:
Robert von Burg 2022-09-05 16:11:35 +02:00
parent cc31e72d56
commit fd2ba1be0c
Signed by: eitch
GPG Key ID: 75DB9C85C74331F7
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
li.strolch.service/src/main/java/li/strolch/metrics/MetricPolicy.java
View File

@ -26,7 +26,11 @@ public abstract class MetricPolicy extends StrolchPolicy {
} }
public void incr(Resource metric, int value, ZonedDateTime time) { public void incr(Resource metric, int value, ZonedDateTime time) {
long timeStamp = getTimeStamp(time); incr(metric, value, time, ChronoUnit.HOURS);
}
public void incr(Resource metric, int value, ZonedDateTime time, ChronoUnit granularity) {
long timeStamp = getTimeStamp(time, granularity);
ITimeVariable<IntegerValue> timeEvolution = getIntegerMetric(metric).getTimeEvolution(); ITimeVariable<IntegerValue> timeEvolution = getIntegerMetric(metric).getTimeEvolution();
ITimeValue<IntegerValue> currentValue = timeEvolution.getValueAt(timeStamp); ITimeValue<IntegerValue> currentValue = timeEvolution.getValueAt(timeStamp);
if (currentValue != null && currentValue.getTime() == timeStamp) { if (currentValue != null && currentValue.getTime() == timeStamp) {
@ -34,12 +38,15 @@ public abstract class MetricPolicy extends StrolchPolicy {
} else { } else {
timeEvolution.setValueAt(timeStamp, getValue(value)); timeEvolution.setValueAt(timeStamp, getValue(value));
} }
timeEvolution.compact();
tx().update(metric); tx().update(metric);
} }
public void add(Resource metric, int value, ZonedDateTime time) { public void add(Resource metric, int value, ZonedDateTime time) {
long timeStamp = getTimeStamp(time); add(metric, value, time, ChronoUnit.HOURS);
}
public void add(Resource metric, int value, ZonedDateTime time, ChronoUnit granularity) {
long timeStamp = getTimeStamp(time, granularity);
ITimeVariable<IntegerListValue> timeEvolution = getIntegerListMetric(metric).getTimeEvolution(); ITimeVariable<IntegerListValue> timeEvolution = getIntegerListMetric(metric).getTimeEvolution();
ITimeValue<IntegerListValue> currentValue = timeEvolution.getValueAt(timeStamp); ITimeValue<IntegerListValue> currentValue = timeEvolution.getValueAt(timeStamp);
if (currentValue != null && currentValue.getTime() == timeStamp) { if (currentValue != null && currentValue.getTime() == timeStamp) {
@ -47,19 +54,17 @@ public abstract class MetricPolicy extends StrolchPolicy {
} else { } else {
timeEvolution.setValueAt(timeStamp, getValueList(value)); timeEvolution.setValueAt(timeStamp, getValueList(value));
} }
timeEvolution.compact();
tx().update(metric); tx().update(metric);
} }
public void set(Resource metric, boolean value, ZonedDateTime time) { public void set(Resource metric, boolean value, ZonedDateTime time) {
long timeStamp = getTimeStamp(time); set(metric, value, time, ChronoUnit.HOURS);
}
public void set(Resource metric, boolean value, ZonedDateTime time, ChronoUnit granularity) {
long timeStamp = getTimeStamp(time, granularity);
ITimeVariable<BooleanValue> timeEvolution = getBooleanMetric(metric).getTimeEvolution(); ITimeVariable<BooleanValue> timeEvolution = getBooleanMetric(metric).getTimeEvolution();
ITimeValue<BooleanValue> currentValue = timeEvolution.getValueAt(timeStamp);
if (currentValue != null && currentValue.getTime() == timeStamp) {
timeEvolution.setValueAt(timeStamp, currentValue.getValue().add((value)));
} else {
timeEvolution.setValueAt(timeStamp, getValue(value)); timeEvolution.setValueAt(timeStamp, getValue(value));
} timeEvolution.compact();
tx().update(metric); tx().update(metric);
} }
@ -105,8 +110,8 @@ public abstract class MetricPolicy extends StrolchPolicy {
return new IntegerListValue(value); return new IntegerListValue(value);
} }
protected long getTimeStamp(ZonedDateTime time) { protected long getTimeStamp(ZonedDateTime time, ChronoUnit granularity) {
return time.truncatedTo(ChronoUnit.HOURS).toInstant().toEpochMilli(); return time.truncatedTo(granularity).toInstant().toEpochMilli();
} }
protected int getDurationSeconds(Duration duration) { protected int getDurationSeconds(Duration duration) {