cleanup

Signed-off-by: Yuri Shkuro <github@ysh.us>

cmd/collector/app/sanitizer/sanitizer.go

@@ -23,7 +23,13 @@ import (
 // span should implement this interface.
 type SanitizeSpan func(span *model.Span) *model.Span
 
-// NewChainedSanitizer creates a Sanitizer from the variadic list of passed Sanitizers
+// StandardSanitizers are automatically applied by SpanProcessor.
+var StandardSanitizers []SanitizeSpan = []SanitizeSpan{
+	NewEmptyServiceNameSanitizer(),
+}
+
+// NewChainedSanitizer creates a Sanitizer from the variadic list of passed Sanitizers.
+// If the list only has one element, it is returned directly to minimize indirection.
 func NewChainedSanitizer(sanitizers ...SanitizeSpan) SanitizeSpan {
 	if len(sanitizers) == 1 {
 		return sanitizers[0]

cmd/collector/app/span_processor.go

@@ -96,9 +96,7 @@ func newSpanProcessor(spanWriter spanstore.Writer, additional []ProcessSpan, opt
 	}
 	boundedQueue := queue.NewBoundedQueue(options.queueSize, droppedItemHandler)
 
-	sanitizers := []sanitizer.SanitizeSpan{
-		sanitizer.NewEmptyServiceNameSanitizer(),
-	}
+	sanitizers := append([]sanitizer.SanitizeSpan{}, sanitizer.StandardSanitizers...)
 	if options.sanitizer != nil {
 		sanitizers = append(sanitizers, options.sanitizer)
 	}