Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ignore span's scope version for java/nodejs tests #1216

Merged
merged 1 commit into from Mar 12, 2024
Merged

ignore span's scope version for java/nodejs tests #1216

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 17 additions & 0 deletions functional_tests/functional_test.go
View file
Open in desktop
Expand Up @@ -421,6 +421,9 @@ func testNodeJSTraces(t *testing.T) {
}, 3*time.Minute, 5*time.Second)
require.NotNil(t, selectedTrace)

maskScopeVersion(*selectedTrace)
maskScopeVersion(expectedTraces)

err = ptracetest.CompareTraces(expectedTraces, *selectedTrace,
ptracetest.IgnoreResourceAttributeValue("process.pid"),
ptracetest.IgnoreResourceAttributeValue("container.id"),
Expand Down Expand Up @@ -475,6 +478,9 @@ func testJavaTraces(t *testing.T) {

require.NotNil(t, selectedTrace)

maskScopeVersion(*selectedTrace)
maskScopeVersion(expectedTraces)

err = ptracetest.CompareTraces(expectedTraces, *selectedTrace,
ptracetest.IgnoreResourceAttributeValue("os.description"),
ptracetest.IgnoreResourceAttributeValue("process.pid"),
Expand Down Expand Up @@ -1244,3 +1250,14 @@ func waitForLogs(t *testing.T, entriesNum int, lc *consumertest.LogsSink) {
"failed to receive %d entries, received %d logs in %d minutes", entriesNum,
len(lc.AllLogs()), timeoutMinutes)
}

func maskScopeVersion(traces ptrace.Traces) {
rss := traces.ResourceSpans()
for i := 0; i < rss.Len(); i++ {
rs := rss.At(i)
for j := 0; j < rs.ScopeSpans().Len(); j++ {
ss := rs.ScopeSpans().At(j)
ss.Scope().SetVersion("")
}
}
}