Skip to content
This repository was archived by the owner on Dec 23, 2023. It is now read-only.

Commit f1ffd06

Browse files
authored
Fix bug: Dropwizard Meter should have non-null start Timestamp (#1609)
* Fix bug: Dropwizard Meter should have non-null start Timestamp * fix build * Add TODO
1 parent 6aad1e8 commit f1ffd06

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

contrib/dropwizard/src/main/java/io/opencensus/contrib/dropwizard/DropWizardMetrics.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ public DropWizardMetrics(List<com.codahale.metrics.MetricRegistry> metricRegistr
7272
Utils.checkNotNull(metricRegistryList, "metricRegistryList"), "metricRegistry");
7373
this.metricRegistryList = metricRegistryList;
7474
clock = MillisClock.getInstance();
75+
76+
// TODO(mayurkale): consider to add cache map<string, CacheEntry> where CacheEntry is
77+
// {MetricDescriptor, startTime}
7578
cumulativeStartTimestamp = clock.now();
7679
}
7780

@@ -162,7 +165,7 @@ private Metric collectMeter(String dropwizardName, Meter meter) {
162165
TimeSeries.createWithOnePoint(
163166
Collections.<LabelValue>emptyList(),
164167
Point.create(Value.longValue(meter.getCount()), clock.now()),
165-
null);
168+
cumulativeStartTimestamp);
166169

167170
return Metric.createWithOneTimeSeries(metricDescriptor, timeSeries);
168171
}

contrib/dropwizard/src/test/java/io/opencensus/contrib/dropwizard/DropWizardMetricsTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ public void collect_Meter() {
237237
assertThat(metrics.get(0).getTimeSeriesList().get(0).getPoints().size()).isEqualTo(1);
238238
assertThat(metrics.get(0).getTimeSeriesList().get(0).getPoints().get(0).getValue())
239239
.isEqualTo(Value.longValue(2));
240-
assertThat(metrics.get(0).getTimeSeriesList().get(0).getStartTimestamp()).isNull();
240+
assertThat(metrics.get(0).getTimeSeriesList().get(0).getStartTimestamp()).isNotNull();
241241
}
242242

243243
@Test
@@ -252,7 +252,7 @@ public void collect_Histogram() {
252252
.isEqualTo(
253253
MetricDescriptor.create(
254254
"codahale_result_histogram",
255-
"Collected from codahale (metric=result, " + "type=com.codahale.metrics.Histogram)",
255+
"Collected from codahale (metric=result, type=com.codahale.metrics.Histogram)",
256256
DEFAULT_UNIT,
257257
Type.SUMMARY,
258258
Collections.<LabelKey>emptyList()));

0 commit comments

Comments
 (0)