Make 'fast' merger the default

app/benchmark_internal_test.go

@@ -64,15 +64,6 @@ func BenchmarkReportUpgrade(b *testing.B) {
 }
 
 func BenchmarkReportMerge(b *testing.B) {
-	reports := upgradeReports(readReportFiles(b, *benchReportPath))
-	merger := NewSmartMerger()
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		merger.Merge(reports)
-	}
-}
-
-func BenchmarkReportFastMerge(b *testing.B) {
 	reports := upgradeReports(readReportFiles(b, *benchReportPath))
 	merger := NewFastMerger()
 	b.ResetTimer()

app/collector.go

@@ -107,7 +107,7 @@ func NewCollector(window time.Duration) Collector {
 		waitableCondition: waitableCondition{
 			waiters: map[chan struct{}]struct{}{},
 		},
-		merger: NewSmartMerger(),
+		merger: NewFastMerger(),
 	}
 }
 
@@ -292,7 +292,7 @@ func NewFileCollector(path string, window time.Duration) (Collector, error) {
 		go replay(collector, timestamps, reports)
 		return collector, nil
 	}
-	return StaticCollector(NewSmartMerger().Merge(reports).Upgrade()), nil
+	return StaticCollector(NewFastMerger().Merge(reports).Upgrade()), nil
 }
 
 func timestampFromFilepath(path string) (time.Time, error) {

app/multitenant/aws_collector.go

@@ -154,7 +154,7 @@ func NewAWSCollector(config AWSCollectorConfig) (AWSCollector, error) {
 		s3:        config.S3Store,
 		userIDer:  config.UserIDer,
 		tableName: config.DynamoTable,
-		merger:    app.NewSmartMerger(),
+		merger:    app.NewFastMerger(),
 		inProcess: newInProcessStore(reportCacheSize, config.Window),
 		memcache:  config.MemcacheClient,
 		window:    config.Window,