Skip to content

Commit

Permalink
[pkg/pdatatest] Ignore span ID for ptracetest (#27833)
Browse files Browse the repository at this point in the history
**Description:** 
Support ignore span ID in span comparisons for ptracetest.

**Link to tracking Issue:** 

#27685

**Testing:** 
make chlog-validate 
go test for pdatatest

**Documentation:**
  • Loading branch information
sakulali authored Oct 19, 2023
1 parent 51b8081 commit 4b41ec6
Show file tree
Hide file tree
Showing 5 changed files with 99 additions and 0 deletions.
27 changes: 27 additions & 0 deletions .chloggen/ptracetest-ignore-spanid.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: pkg/pdatatest

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: "support ignore span ID in span comparisons for ptracetest"

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [27685]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: []
22 changes: 22 additions & 0 deletions pkg/pdatatest/ptracetest/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,28 @@ func sortSpanSlices(ts ptrace.Traces) {
}
}

// IgnoreSpanID is a CompareTracesOption that clears SpanID fields on all spans.
func IgnoreSpanID() CompareTracesOption {
return compareTracesOptionFunc(func(expected, actual ptrace.Traces) {
spanID := pcommon.NewSpanIDEmpty()
maskSpanID(expected, spanID)
maskSpanID(actual, spanID)
})
}

func maskSpanID(traces ptrace.Traces, spanID pcommon.SpanID) {
for i := 0; i < traces.ResourceSpans().Len(); i++ {
rs := traces.ResourceSpans().At(i)
for j := 0; j < rs.ScopeSpans().Len(); j++ {
ss := rs.ScopeSpans().At(j)
for k := 0; k < ss.Spans().Len(); k++ {
span := ss.Spans().At(k)
span.SetSpanID(spanID)
}
}
}
}

// IgnoreStartTimestamp is a CompareTracesOption that clears StartTimestamp fields on all spans.
func IgnoreStartTimestamp() CompareTracesOption {
return compareTracesOptionFunc(func(expected, actual ptrace.Traces) {
Expand Down
21 changes: 21 additions & 0 deletions pkg/pdatatest/ptracetest/testdata/ignore-spanid/actual.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
resourceSpans:
- resource:
attributes:
- key: host.name
value:
stringValue: node1
scopeSpans:
- scope:
name: collector
version: v0.1.0
spans:
- attributes:
- key: key1
value:
stringValue: value1
name: span1
parentSpanId: ""
spanId: fd0da883bb27cd6b
status: {}
traceId: 8c8b1765a7b0acf0b66aa4623fcb7bd5

19 changes: 19 additions & 0 deletions pkg/pdatatest/ptracetest/testdata/ignore-spanid/expected.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
resourceSpans:
- resource:
attributes:
- key: host.name
value:
stringValue: node1
scopeSpans:
- scope:
name: collector
version: v0.1.0
spans:
- attributes:
- key: key1
value:
stringValue: value1
name: span1
parentSpanId: ""
status: {}
traceId: 8c8b1765a7b0acf0b66aa4623fcb7bd5
10 changes: 10 additions & 0 deletions pkg/pdatatest/ptracetest/traces_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,16 @@ func TestCompareTraces(t *testing.T) {
),
withOptions: nil,
},
{
name: "ignore-spanid",
compareOptions: []CompareTracesOption{
IgnoreSpanID(),
},
withoutOptions: multierr.Combine(
errors.New("resource \"map[host.name:node1]\": scope \"collector\": span \"span1\": span ID doesn't match expected: fd0da883bb27cd6b, actual: "),
),
withOptions: nil,
},
{
name: "ignore-start-timestamp",
compareOptions: []CompareTracesOption{
Expand Down

0 comments on commit 4b41ec6

Please sign in to comment.