Skip to content

Commit

Permalink
ignore span's scope version for java/nodejs tests (#1216)
Browse files Browse the repository at this point in the history
  • Loading branch information
jinja2 committed Mar 12, 2024
1 parent b3ea371 commit 82704b4
Showing 1 changed file with 17 additions and 0 deletions.
17 changes: 17 additions & 0 deletions functional_tests/functional_test.go
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("")
}
}
}

0 comments on commit 82704b4

Please sign in to comment.