diff --git a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobStoreStats.java b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobStoreStats.java index 73e7a69532..142a2856d3 100644 --- a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobStoreStats.java +++ b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/BlobStoreStats.java @@ -230,14 +230,14 @@ public class BlobStoreStats extends AnnotatedStandardMBean implements BlobStoreS this.uploadHisto = sp.getHistogram(BLOB_UPLOADS, StatsOptions.DEFAULT); this.uploadCount = sp.getMeter(BLOB_UPLOAD_COUNT, StatsOptions.DEFAULT); this.uploadErrorCount = sp.getMeter(BLOB_UPLOAD_ERROR_COUNT, StatsOptions.DEFAULT); - this.uploadSizeSeries = sp.getMeter(BLOB_UPLOAD_SIZE, StatsOptions.TIME_SERIES_ONLY); - this.uploadTimeSeries = sp.getMeter(BLOB_UPLOAD_TIME, StatsOptions.TIME_SERIES_ONLY); + this.uploadSizeSeries = sp.getMeter(BLOB_UPLOAD_SIZE, StatsOptions.DEFAULT); + this.uploadTimeSeries = sp.getMeter(BLOB_UPLOAD_TIME, StatsOptions.DEFAULT); this.uploadRateSeries = getAvgTimeSeries(BLOB_UPLOAD_SIZE, BLOB_UPLOAD_TIME); this.downloadHisto = sp.getHistogram(BLOB_DOWNLOADS, StatsOptions.DEFAULT); this.downloadCount = sp.getMeter(BLOB_DOWNLOAD_COUNT, StatsOptions.DEFAULT); - this.downloadSizeSeries = sp.getMeter(BLOB_DOWNLOAD_SIZE, StatsOptions.TIME_SERIES_ONLY); - this.downloadTimeSeries = sp.getMeter(BLOB_DOWNLOAD_TIME, StatsOptions.TIME_SERIES_ONLY); + this.downloadSizeSeries = sp.getMeter(BLOB_DOWNLOAD_SIZE, StatsOptions.DEFAULT); + this.downloadTimeSeries = sp.getMeter(BLOB_DOWNLOAD_TIME, StatsOptions.DEFAULT); this.downloadRateSeries = getAvgTimeSeries(BLOB_DOWNLOAD_SIZE, BLOB_DOWNLOAD_TIME); this.downloadErrorCount = sp.getMeter(BLOB_DOWNLOAD_ERROR_COUNT, StatsOptions.DEFAULT); diff --git a/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/BlobStoreStatsTest.java b/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/BlobStoreStatsTest.java index f9befc8762..477539fe4a 100644 --- a/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/BlobStoreStatsTest.java +++ b/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/BlobStoreStatsTest.java @@ -23,13 +23,19 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; +import org.apache.jackrabbit.api.stats.RepositoryStatistics; import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser; import org.apache.jackrabbit.oak.stats.DefaultStatisticsProvider; import org.apache.jackrabbit.oak.stats.StatisticsProvider; +import org.apache.jackrabbit.oak.stats.StatsOptions; import org.junit.After; import org.junit.Test; import static org.junit.Assert.assertEquals; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; public class BlobStoreStatsTest { private ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor(); @@ -76,4 +82,26 @@ public class BlobStoreStatsTest { stats.downloadCompleted("foo"); assertEquals(2, stats.getDownloadCount()); } + + @Test + @SuppressWarnings({"LocalVariableHidesMemberVariable", "ResultOfObjectAllocationIgnored"}) + public void uploadStatsWithDefaultOptions() { + RepositoryStatistics repoStats = mock(RepositoryStatistics.class); + StatisticsProvider statsProvider = mock(StatisticsProvider.class); + when(statsProvider.getStats()).thenReturn(repoStats); + new BlobStoreStats(statsProvider); + verify(statsProvider).getMeter(eq("BLOB_UPLOAD_SIZE"), eq(StatsOptions.DEFAULT)); + verify(statsProvider).getMeter(eq("BLOB_UPLOAD_TIME"), eq(StatsOptions.DEFAULT)); + } + + @Test + @SuppressWarnings({"LocalVariableHidesMemberVariable", "ResultOfObjectAllocationIgnored"}) + public void downloadStatsWithDefaultOptions() { + RepositoryStatistics repoStats = mock(RepositoryStatistics.class); + StatisticsProvider statsProvider = mock(StatisticsProvider.class); + when(statsProvider.getStats()).thenReturn(repoStats); + new BlobStoreStats(statsProvider); + verify(statsProvider).getMeter(eq("BLOB_DOWNLOAD_SIZE"), eq(StatsOptions.DEFAULT)); + verify(statsProvider).getMeter(eq("BLOB_DOWNLOAD_TIME"), eq(StatsOptions.DEFAULT)); + } } \ No newline at end of file