Skip to content

Commit

Permalink
Add Check For Non String Service Name
Browse files Browse the repository at this point in the history
Signed-off-by: Mahad Zaryab <[email protected]>
  • Loading branch information
mahadzaryab1 committed Oct 12, 2024
1 parent f032c20 commit 3fca5a8
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 3 deletions.
8 changes: 6 additions & 2 deletions cmd/jaeger/internal/sanitizer/emptyservicename.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@
package sanitizer

import (
"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/ptrace"

"github.com/jaegertracing/jaeger/pkg/otelsemconv"
)

const (
emptyServiceName = "empty-service-name"
missingServiceName = "missing-service-name"
emptyServiceName = "empty-service-name"
serviceNameWrongType = "service-name-wrong-type"
missingServiceName = "missing-service-name"
)

// NewEmptyServiceNameSanitizer returns a sanitizer function that replaces
Expand All @@ -28,6 +30,8 @@ func sanitizeEmptyServiceName(traces ptrace.Traces) ptrace.Traces {
serviceName, ok := attributes.Get(string(otelsemconv.ServiceNameKey))
if !ok {
attributes.PutStr(string(otelsemconv.ServiceNameKey), missingServiceName)
} else if serviceName.Type() != pcommon.ValueTypeStr {
attributes.PutStr(string(otelsemconv.ServiceNameKey), serviceNameWrongType)
} else if serviceName.Str() == "" {
attributes.PutStr(string(otelsemconv.ServiceNameKey), emptyServiceName)
}
Expand Down
22 changes: 21 additions & 1 deletion cmd/jaeger/internal/sanitizer/emptyservicename_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"go.opentelemetry.io/collector/pdata/ptrace"
)

func TestEmptyServiceNameSanitizer(t *testing.T) {
func TestEmptyServiceNameSanitizer_SubstitutesCorrectlyForStrings(t *testing.T) {
emptyServiceName := ""
nonEmptyServiceName := "hello"
tests := []struct {
Expand Down Expand Up @@ -58,3 +58,23 @@ func TestEmptyServiceNameSanitizer(t *testing.T) {
})
}
}

func TestEmptyServiceNameSanitizer_SubstitutesCorrectlyForNonStringType(t *testing.T) {
traces := ptrace.NewTraces()
traces.
ResourceSpans().
AppendEmpty().
Resource().
Attributes().
PutInt("service.name", 1)
sanitizer := NewEmptyServiceNameSanitizer()
sanitized := sanitizer(traces)
serviceName, ok := sanitized.
ResourceSpans().
At(0).
Resource().
Attributes().
Get("service.name")
require.True(t, ok)
require.Equal(t, "service-name-wrong-type", serviceName.Str())
}

0 comments on commit 3fca5a8

Please sign in to comment.