Skip to content

Commit a63ec45

Browse files
authored
Resolve LongDoubleConversion from Error Prone (#6180)
This commit also changes to handle LongDoubleConversion as errors. Signed-off-by: Johnny Lim <izeye@naver.com>
1 parent 6154d4c commit a63ec45

File tree

41 files changed

+117
-113
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+117
-113
lines changed

build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ subprojects {
7474
options.errorprone.error(
7575
"BadImport",
7676
"DefaultCharset",
77+
"LongDoubleConversion",
7778
"MissingOverride",
7879
"StringCaseLocaleUsage"
7980
)

implementations/micrometer-registry-appoptics/src/main/java/io/micrometer/appoptics/AppOpticsMeterRegistry.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,8 @@ private Optional<String> writeTimer(Timer timer) {
229229
HistogramSnapshot snapshot = timer.takeSnapshot();
230230
long count = snapshot.count();
231231
if (count > 0) {
232-
return Optional.of(write(timer.getId(), "timer", Fields.Count.tag(), decimal(count), Fields.Sum.tag(),
233-
decimal(snapshot.total(getBaseTimeUnit())), Fields.Max.tag(),
232+
return Optional.of(write(timer.getId(), "timer", Fields.Count.tag(), decimal((double) count),
233+
Fields.Sum.tag(), decimal(snapshot.total(getBaseTimeUnit())), Fields.Max.tag(),
234234
decimal(snapshot.max(getBaseTimeUnit()))));
235235
}
236236
return Optional.empty();
@@ -240,8 +240,9 @@ private Optional<String> writeSummary(DistributionSummary summary) {
240240
HistogramSnapshot snapshot = summary.takeSnapshot();
241241
long count = snapshot.count();
242242
if (count > 0) {
243-
return Optional.of(write(summary.getId(), "distributionSummary", Fields.Count.tag(), decimal(count),
244-
Fields.Sum.tag(), decimal(snapshot.total()), Fields.Max.tag(), decimal(snapshot.max())));
243+
return Optional
244+
.of(write(summary.getId(), "distributionSummary", Fields.Count.tag(), decimal((double) count),
245+
Fields.Sum.tag(), decimal(snapshot.total()), Fields.Max.tag(), decimal(snapshot.max())));
245246
}
246247
return Optional.empty();
247248
}

implementations/micrometer-registry-atlas/src/main/java/io/micrometer/atlas/SpectatorLongTaskTimer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public Sample start() {
4141

4242
@Override
4343
public double duration(TimeUnit unit) {
44-
return TimeUtils.nanosToUnit(timer.duration(), unit);
44+
return TimeUtils.nanosToUnit((double) timer.duration(), unit);
4545
}
4646

4747
@Override
@@ -68,7 +68,7 @@ public long stop() {
6868

6969
@Override
7070
public double duration(TimeUnit unit) {
71-
return TimeUtils.nanosToUnit(timer.duration(taskId), unit);
71+
return TimeUtils.nanosToUnit((double) timer.duration(taskId), unit);
7272
}
7373

7474
}

implementations/micrometer-registry-atlas/src/main/java/io/micrometer/atlas/SpectatorTimer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public long count() {
5151
@Override
5252
public double totalTime(TimeUnit unit) {
5353
// the Spectator Timer contract insists that nanos be returned from totalTime()
54-
return TimeUtils.nanosToUnit(timer.totalTime(), unit);
54+
return TimeUtils.nanosToUnit((double) timer.totalTime(), unit);
5555
}
5656

5757
@Override

implementations/micrometer-registry-cloudwatch2/src/main/java/io/micrometer/cloudwatch2/CloudWatchMeterRegistry.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ Stream<MetricDatum> timerData(Timer timer) {
192192
metrics
193193
.add(metricDatum(timer.getId(), "sum", getBaseTimeUnit().name(), timer.totalTime(getBaseTimeUnit())));
194194
long count = timer.count();
195-
metrics.add(metricDatum(timer.getId(), "count", StandardUnit.COUNT, count));
195+
metrics.add(metricDatum(timer.getId(), "count", StandardUnit.COUNT, (double) count));
196196
if (count > 0) {
197197
metrics.add(metricDatum(timer.getId(), "avg", getBaseTimeUnit().name(), timer.mean(getBaseTimeUnit())));
198198
metrics.add(metricDatum(timer.getId(), "max", getBaseTimeUnit().name(), timer.max(getBaseTimeUnit())));
@@ -205,7 +205,7 @@ Stream<MetricDatum> summaryData(DistributionSummary summary) {
205205
Stream.Builder<MetricDatum> metrics = Stream.builder();
206206
metrics.add(metricDatum(summary.getId(), "sum", summary.totalAmount()));
207207
long count = summary.count();
208-
metrics.add(metricDatum(summary.getId(), "count", StandardUnit.COUNT, count));
208+
metrics.add(metricDatum(summary.getId(), "count", StandardUnit.COUNT, (double) count));
209209
if (count > 0) {
210210
metrics.add(metricDatum(summary.getId(), "avg", summary.mean()));
211211
metrics.add(metricDatum(summary.getId(), "max", summary.max()));

implementations/micrometer-registry-datadog/src/main/java/io/micrometer/datadog/DatadogMeterRegistry.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ private Stream<String> writeTimer(Timer timer, Map<String, DatadogMetricMetadata
176176

177177
Meter.Id id = timer.getId();
178178
metrics.add(writeMetric(id, "sum", wallTime, timer.totalTime(getBaseTimeUnit()), Statistic.TOTAL_TIME, null));
179-
metrics.add(writeMetric(id, "count", wallTime, timer.count(), Statistic.COUNT, "occurrence"));
179+
metrics.add(writeMetric(id, "count", wallTime, (double) timer.count(), Statistic.COUNT, "occurrence"));
180180
metrics.add(writeMetric(id, "avg", wallTime, timer.mean(getBaseTimeUnit()), Statistic.VALUE, null));
181181
metrics.add(writeMetric(id, "max", wallTime, timer.max(getBaseTimeUnit()), Statistic.MAX, null));
182182

@@ -194,7 +194,7 @@ private Stream<String> writeSummary(DistributionSummary summary, Map<String, Dat
194194

195195
Meter.Id id = summary.getId();
196196
metrics.add(writeMetric(id, "sum", wallTime, summary.totalAmount(), Statistic.TOTAL, null));
197-
metrics.add(writeMetric(id, "count", wallTime, summary.count(), Statistic.COUNT, "occurrence"));
197+
metrics.add(writeMetric(id, "count", wallTime, (double) summary.count(), Statistic.COUNT, "occurrence"));
198198
metrics.add(writeMetric(id, "avg", wallTime, summary.mean(), Statistic.VALUE, null));
199199
metrics.add(writeMetric(id, "max", wallTime, summary.max(), Statistic.MAX, null));
200200

implementations/micrometer-registry-dynatrace/src/main/java/io/micrometer/dynatrace/types/DynatraceTimer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ DynatraceSummarySnapshot convertIfNecessary(DynatraceSummarySnapshot snapshot, T
101101
protected void recordNonNegative(long amount, TimeUnit unit) {
102102
// store everything in baseTimeUnit
103103
long inBaseUnit = baseTimeUnit().convert(amount, unit);
104-
summary.recordNonNegative(inBaseUnit);
104+
summary.recordNonNegative((double) inBaseUnit);
105105
}
106106

107107
/**

implementations/micrometer-registry-ganglia/src/main/java/io/micrometer/ganglia/GangliaMeterRegistry.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,15 +160,15 @@ private void announceLongTaskTimer(LongTaskTimer longTaskTimer) {
160160

161161
private void announceSummary(DistributionSummary summary) {
162162
HistogramSnapshot snapshot = summary.takeSnapshot();
163-
announce(summary, snapshot.count(), "count");
163+
announce(summary, (double) snapshot.count(), "count");
164164
announce(summary, snapshot.total(), "sum");
165165
announce(summary, snapshot.mean(), "avg");
166166
announce(summary, snapshot.max(), "max");
167167
}
168168

169169
private void announceTimer(Timer timer) {
170170
HistogramSnapshot snapshot = timer.takeSnapshot();
171-
announce(timer, snapshot.count(), "count");
171+
announce(timer, (double) snapshot.count(), "count");
172172
announce(timer, snapshot.total(getBaseTimeUnit()), "sum");
173173
announce(timer, snapshot.mean(getBaseTimeUnit()), "avg");
174174
announce(timer, snapshot.max(getBaseTimeUnit()), "max");

implementations/micrometer-registry-humio/src/main/java/io/micrometer/humio/HumioMeterRegistry.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,14 +243,14 @@ String writeLongTaskTimer(LongTaskTimer timer) {
243243
// VisibleForTesting
244244
String writeTimer(Timer timer) {
245245
HistogramSnapshot snap = timer.takeSnapshot();
246-
return writeEvent(timer, event("count", snap.count()), event("sum", snap.total(getBaseTimeUnit())),
246+
return writeEvent(timer, event("count", (double) snap.count()), event("sum", snap.total(getBaseTimeUnit())),
247247
event("avg", snap.mean(getBaseTimeUnit())), event("max", snap.max(getBaseTimeUnit())));
248248
}
249249

250250
// VisibleForTesting
251251
String writeSummary(DistributionSummary summary) {
252252
HistogramSnapshot snap = summary.takeSnapshot();
253-
return writeEvent(summary, event("count", snap.count()), event("sum", snap.total()),
253+
return writeEvent(summary, event("count", (double) snap.count()), event("sum", snap.total()),
254254
event("avg", snap.mean()), event("max", snap.max()));
255255
}
256256

implementations/micrometer-registry-kairos/src/main/java/io/micrometer/kairos/KairosMeterRegistry.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ protected void publish() {
106106

107107
Stream<String> writeSummary(DistributionSummary summary) {
108108
long wallTime = config().clock().wallTime();
109-
return Stream.of(writeMetric(idWithSuffix(summary.getId(), "count"), wallTime, summary.count()),
109+
return Stream.of(writeMetric(idWithSuffix(summary.getId(), "count"), wallTime, (double) summary.count()),
110110
writeMetric(idWithSuffix(summary.getId(), "avg"), wallTime, summary.mean()),
111111
writeMetric(idWithSuffix(summary.getId(), "sum"), wallTime, summary.totalAmount()),
112112
writeMetric(idWithSuffix(summary.getId(), "max"), wallTime, summary.max()));
@@ -121,7 +121,7 @@ Stream<String> writeFunctionTimer(FunctionTimer timer) {
121121

122122
Stream<String> writeTimer(Timer timer) {
123123
long wallTime = config().clock().wallTime();
124-
return Stream.of(writeMetric(idWithSuffix(timer.getId(), "count"), wallTime, timer.count()),
124+
return Stream.of(writeMetric(idWithSuffix(timer.getId(), "count"), wallTime, (double) timer.count()),
125125
writeMetric(idWithSuffix(timer.getId(), "max"), wallTime, timer.max(getBaseTimeUnit())),
126126
writeMetric(idWithSuffix(timer.getId(), "avg"), wallTime, timer.mean(getBaseTimeUnit())),
127127
writeMetric(idWithSuffix(timer.getId(), "sum"), wallTime, timer.totalTime(getBaseTimeUnit())));

0 commit comments

Comments
 (0)