From 1b5a91c776821789474f791e056834c4875887e4 Mon Sep 17 00:00:00 2001 From: Mark Nellemann Date: Wed, 7 Dec 2022 16:33:56 +0100 Subject: [PATCH] Go from millisec. to sec. precision in influx timestamps. Do not go to minNumberOfSamples at first processing. --- src/main/java/biz/nellemann/hmci/InfluxClient.java | 4 ++-- src/main/java/biz/nellemann/hmci/Resource.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/biz/nellemann/hmci/InfluxClient.java b/src/main/java/biz/nellemann/hmci/InfluxClient.java index 91f898b..8076b30 100644 --- a/src/main/java/biz/nellemann/hmci/InfluxClient.java +++ b/src/main/java/biz/nellemann/hmci/InfluxClient.java @@ -117,7 +117,7 @@ public final class InfluxClient { measurements.forEach( (m) -> { Point.Builder builder = Point.measurement(name) - .time(timestamp.toEpochMilli(), TimeUnit.MILLISECONDS) + .time(timestamp.getEpochSecond(), TimeUnit.SECONDS) .tag(m.tags) .fields(m.fields); @@ -133,7 +133,7 @@ public final class InfluxClient { measurements.forEach( (m) -> { log.trace("processMeasurementMap() - timestamp: {}, tags: {}, fields: {}", m.timestamp, m.tags, m.fields); Point.Builder builder = Point.measurement(name) - .time(m.timestamp.toEpochMilli(), TimeUnit.MILLISECONDS) + .time(m.timestamp.getEpochSecond(), TimeUnit.SECONDS) .tag(m.tags) .fields(m.fields); listOfPoints.add(builder.build()); diff --git a/src/main/java/biz/nellemann/hmci/Resource.java b/src/main/java/biz/nellemann/hmci/Resource.java index 6a591a7..c7fb7bd 100644 --- a/src/main/java/biz/nellemann/hmci/Resource.java +++ b/src/main/java/biz/nellemann/hmci/Resource.java @@ -124,9 +124,9 @@ public abstract class Resource { sampleHistory.remove(0); } - // Decrease until we reach minSamples + // Decrease down to minSamples if(noOfSamples > minNumberOfSamples) { - noOfSamples = Math.min( (noOfSamples - 1), Math.max( (noOfSamples - processed), minNumberOfSamples)); + noOfSamples = Math.min( (noOfSamples - 1), Math.max( (noOfSamples - processed) + 5, minNumberOfSamples)); } }