Skip to content

[chore][pkg/ottl] Add profile to the infer priorities #39612

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

Merged
TylerHelmuth merged 2 commits into from
Apr 29, 2025
Merged

[chore][pkg/ottl] Add profile to the infer priorities #39612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6cca27a
[chore][pkg/ottl] Add profile to the infer priorities
rockdaboot Apr 24, 2025
1cd2305
Add tests
rockdaboot Apr 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pkg/ottl/context_inferrer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ var defaultContextInferPriority = []string{
"metric",
"spanevent",
"span",
"profile",
"scope",
"instrumentation_scope",
"resource",
Expand Down
23 changes: 23 additions & 0 deletions pkg/ottl/context_inferrer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@ func Test_NewPriorityContextInferrer_DefaultPriorityList(t *testing.T) {
"metric",
"spanevent",
"span",
"profile",
"scope",
"instrumentation_scope",
"resource",
Expand All @@ -316,6 +317,7 @@ func Test_NewPriorityContextInferrer_InferStatements_DefaultContextsOrder(t *tes
"datapoint": newDummyPriorityContextInferrerCandidate(true, true, []string{"scope", "instrumentation_scope", "resource"}),
"span": newDummyPriorityContextInferrerCandidate(true, true, []string{"spanevent", "scope", "instrumentation_scope", "resource"}),
"spanevent": newDummyPriorityContextInferrerCandidate(true, true, []string{"scope", "instrumentation_scope", "resource"}),
"profile": newDummyPriorityContextInferrerCandidate(true, true, []string{"profile", "scope", "instrumentation_scope", "resource"}),
"scope": newDummyPriorityContextInferrerCandidate(true, true, []string{"resource"}),
"instrumentation_scope": newDummyPriorityContextInferrerCandidate(true, true, []string{"resource"}),
"resource": newDummyPriorityContextInferrerCandidate(true, true, []string{}),
Expand Down Expand Up @@ -386,6 +388,16 @@ func Test_NewPriorityContextInferrer_InferStatements_DefaultContextsOrder(t *tes
statement: `set(span.name, "foo") where spanevent.name != nil and scope.name != nil and resource.attributes["foo"] != nil`,
expected: "spanevent",
},
{
name: "profile,instrumentation_scope,resource",
statement: `set(profile.name, "foo") where profile.name != nil and instrumentation_scope.name != nil and resource.attributes["foo"] != nil`,
expected: "profile",
},
{
name: "profile,scope,resource",
statement: `set(profile.name, "foo") where profile.name != nil and scope.name != nil and resource.attributes["foo"] != nil`,
expected: "profile",
},
{
name: "resource",
statement: `set(resource.attributes["bar"], "foo") where dummy.attributes["foo"] != nil`,
Expand All @@ -409,6 +421,7 @@ func Test_NewPriorityContextInferrer_InferConditions_DefaultContextsOrder(t *tes
"datapoint": newDummyPriorityContextInferrerCandidate(true, true, []string{"scope", "instrumentation_scope", "resource"}),
"span": newDummyPriorityContextInferrerCandidate(true, true, []string{"spanevent", "scope", "instrumentation_scope", "resource"}),
"spanevent": newDummyPriorityContextInferrerCandidate(true, true, []string{"scope", "instrumentation_scope", "resource"}),
"profile": newDummyPriorityContextInferrerCandidate(true, true, []string{"profile", "scope", "instrumentation_scope", "resource"}),
"scope": newDummyPriorityContextInferrerCandidate(true, true, []string{"resource"}),
"instrumentation_scope": newDummyPriorityContextInferrerCandidate(true, true, []string{"resource"}),
"resource": newDummyPriorityContextInferrerCandidate(true, true, []string{}),
Expand Down Expand Up @@ -479,6 +492,16 @@ func Test_NewPriorityContextInferrer_InferConditions_DefaultContextsOrder(t *tes
condition: `span.name != nil and spanevent.name != nil and scope.name != nil and resource.attributes["foo"] != nil`,
expected: "spanevent",
},
{
name: "profile,instrumentation_scope,resource",
condition: `profile.name != nil and profile.name != nil and instrumentation_scope.name != nil and resource.attributes["foo"] != nil`,
expected: "profile",
},
{
name: "profile,scope,resource",
condition: `profile.name != nil and profile.name != nil and scope.name != nil and resource.attributes["foo"] != nil`,
expected: "profile",
},
{
name: "resource",
condition: `resource.attributes["bar"] != nil and dummy.attributes["foo"] != nil`,
Expand Down