Remove Special Handling of Service Name

Signed-off-by: Mahad Zaryab <[email protected]>

cmd/jaeger/internal/sanitizer/utf8.go

@@ -8,8 +8,6 @@ import (
 
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/ptrace"
-
-	"github.com/jaegertracing/jaeger/pkg/otelsemconv"
 )
 
 const (
@@ -53,15 +51,6 @@ func sanitizeUTF8(traces ptrace.Traces) ptrace.Traces {
 					span.SetName(invalidSpanName)
 				}
 
-				serviceName, ok := span.Attributes().Get(string(otelsemconv.ServiceNameKey))
-				if ok &&
-					serviceName.Type() == pcommon.ValueTypeStr &&
-					!utf8.ValidString(serviceName.Str()) {
-					sanitized := []byte(serviceName.Str())
-					newVal := span.Attributes().PutEmptyBytes(string(otelsemconv.ServiceNameKey))
-					newVal.Append(sanitized...)
-				}
-
 				sanitizeAttributes(span.Attributes())
 			}
 		}

cmd/jaeger/internal/sanitizer/utf8_test.go

@@ -192,84 +192,6 @@ func TestUTF8Sanitizer_DoesNotSanitizeInvalidSpanName(t *testing.T) {
 	require.Equal(t, "name", name)
 }
 
-func TestUTF8Sanitizer_SanitizesInvalidServiceName(t *testing.T) {
-	traces := ptrace.NewTraces()
-	traces.
-		ResourceSpans().
-		AppendEmpty().
-		ScopeSpans().
-		AppendEmpty().
-		Spans().
-		AppendEmpty().
-		Attributes().
-		PutStr("service.name", invalidUTF8())
-	sanitizer := NewUTF8Sanitizer()
-	sanitized := sanitizer(traces)
-	value, ok := sanitized.
-		ResourceSpans().
-		At(0).
-		ScopeSpans().
-		At(0).
-		Spans().
-		At(0).
-		Attributes().
-		Get("service.name")
-	require.True(t, ok)
-	require.Equal(t, []byte(invalidUTF8()), value.Bytes().AsRaw())
-}
-
-func TestUTF8Sanitizer_DoesNotSanitizeValidServiceName(t *testing.T) {
-	traces := ptrace.NewTraces()
-	traces.
-		ResourceSpans().
-		AppendEmpty().
-		ScopeSpans().
-		AppendEmpty().
-		Spans().
-		AppendEmpty().
-		Attributes().
-		PutStr("service.name", "name")
-	sanitizer := NewUTF8Sanitizer()
-	sanitized := sanitizer(traces)
-	value, ok := sanitized.
-		ResourceSpans().
-		At(0).
-		ScopeSpans().
-		At(0).
-		Spans().
-		At(0).
-		Attributes().
-		Get("service.name")
-	require.True(t, ok)
-	require.Equal(t, "name", value.Str())
-}
-
-func TestUTF8Sanitizer_DoesNotSanitizeNonStringServiceName(t *testing.T) {
-	traces := ptrace.NewTraces()
-	traces.
-		ResourceSpans().
-		AppendEmpty().
-		ScopeSpans().
-		AppendEmpty().
-		Spans().
-		AppendEmpty().
-		Attributes().
-		PutInt("service.name", 1)
-	sanitizer := NewUTF8Sanitizer()
-	sanitized := sanitizer(traces)
-	value, ok := sanitized.
-		ResourceSpans().
-		At(0).
-		ScopeSpans().
-		At(0).
-		Spans().
-		At(0).
-		Attributes().
-		Get("service.name")
-	require.True(t, ok)
-	require.EqualValues(t, 1, value.Int())
-}
-
 func TestUTF8Sanitizer_RemovesInvalidKeys(t *testing.T) {
 	traces := ptrace.NewTraces()
 	traces.