diff --git a/src/main/java/org/dataloader/DataLoaderOptions.java b/src/main/java/org/dataloader/DataLoaderOptions.java index 8cd35ba..c6d47ca 100644 --- a/src/main/java/org/dataloader/DataLoaderOptions.java +++ b/src/main/java/org/dataloader/DataLoaderOptions.java @@ -18,7 +18,7 @@ import org.dataloader.annotations.PublicApi; import org.dataloader.impl.Assertions; -import org.dataloader.stats.SimpleStatisticsCollector; +import org.dataloader.stats.NoOpStatisticsCollector; import org.dataloader.stats.StatisticsCollector; import java.util.Optional; @@ -55,7 +55,7 @@ public DataLoaderOptions() { cachingEnabled = true; cachingExceptionsEnabled = true; maxBatchSize = -1; - statisticsCollector = SimpleStatisticsCollector::new; + statisticsCollector = NoOpStatisticsCollector::new; environmentProvider = NULL_PROVIDER; valueCacheOptions = ValueCacheOptions.newOptions(); } diff --git a/src/test/java/org/dataloader/DataLoaderRegistryTest.java b/src/test/java/org/dataloader/DataLoaderRegistryTest.java index 6d70654..aeaf668 100644 --- a/src/test/java/org/dataloader/DataLoaderRegistryTest.java +++ b/src/test/java/org/dataloader/DataLoaderRegistryTest.java @@ -1,5 +1,6 @@ package org.dataloader; +import org.dataloader.stats.SimpleStatisticsCollector; import org.dataloader.stats.Statistics; import org.junit.Test; @@ -77,9 +78,15 @@ public void stats_can_be_collected() { DataLoaderRegistry registry = new DataLoaderRegistry(); - DataLoader dlA = newDataLoader(identityBatchLoader); - DataLoader dlB = newDataLoader(identityBatchLoader); - DataLoader dlC = newDataLoader(identityBatchLoader); + DataLoader dlA = newDataLoader(identityBatchLoader, + DataLoaderOptions.newOptions().setStatisticsCollector(SimpleStatisticsCollector::new) + ); + DataLoader dlB = newDataLoader(identityBatchLoader, + DataLoaderOptions.newOptions().setStatisticsCollector(SimpleStatisticsCollector::new) + ); + DataLoader dlC = newDataLoader(identityBatchLoader, + DataLoaderOptions.newOptions().setStatisticsCollector(SimpleStatisticsCollector::new) + ); registry.register("a", dlA).register("b", dlB).register("c", dlC); diff --git a/src/test/java/org/dataloader/DataLoaderStatsTest.java b/src/test/java/org/dataloader/DataLoaderStatsTest.java index 1be2e8c..c32cbc1 100644 --- a/src/test/java/org/dataloader/DataLoaderStatsTest.java +++ b/src/test/java/org/dataloader/DataLoaderStatsTest.java @@ -24,7 +24,9 @@ public class DataLoaderStatsTest { @Test public void stats_are_collected_by_default() { BatchLoader batchLoader = CompletableFuture::completedFuture; - DataLoader loader = newDataLoader(batchLoader); + DataLoader loader = newDataLoader(batchLoader, + DataLoaderOptions.newOptions().setStatisticsCollector(SimpleStatisticsCollector::new) + ); loader.load("A"); loader.load("B"); @@ -154,7 +156,9 @@ public void stats_are_collected_with_caching_disabled() { @Test public void stats_are_collected_on_exceptions() { - DataLoader loader = DataLoaderFactory.newDataLoaderWithTry(batchLoaderThatBlows); + DataLoader loader = DataLoaderFactory.newDataLoaderWithTry(batchLoaderThatBlows, + DataLoaderOptions.newOptions().setStatisticsCollector(SimpleStatisticsCollector::new) + ); loader.load("A"); loader.load("exception");