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.

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

[pkg/ottl] Add parser utility to rewrite statements appending missing paths context #35716

Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
27 changes: 27 additions & 0 deletions .chloggen/ottl-add-statement-context-append-utility.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/ottl

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Add OTTL parser utility to rewrite statements appending missing paths context

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

# (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: "The `ottl.Parser[K]` has a new function `AppendStatementPathsContext`"

# 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: [api]
54 changes: 54 additions & 0 deletions pkg/ottl/paths.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
// SPDX-License-Identifier: Apache-2.0

package ottl // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl"
import (
"fmt"
"strings"
)

// grammarPathVisitor is used to extract all path from a parsedStatement or booleanExpression
type grammarPathVisitor struct {
Expand Down Expand Up @@ -30,3 +34,53 @@ func getBooleanExpressionPaths(be *booleanExpression) []path {
be.accept(visitor)
return visitor.paths
}

// AppendStatementPathsContext changes the given OTTL statement adding the context name prefix
// to all context-less paths. No modifications are performed for paths which [Path.Context]
// value matches any WithPathContextNames value.
// The context argument must be valid WithPathContextNames value, otherwise an error is returned.
func (p *Parser[K]) AppendStatementPathsContext(context string, statement string) (string, error) {
evan-bradley marked this conversation as resolved.
Show resolved Hide resolved
TylerHelmuth marked this conversation as resolved.
Show resolved Hide resolved
if _, ok := p.pathContextNames[context]; !ok {
return statement, fmt.Errorf(`unknown context "%s" for parser %T, valid options are: %s`, context, p, p.buildPathContextNamesText(""))
}
parsed, err := parseStatement(statement)
if err != nil {
return "", err
}
paths := getParsedStatementPaths(parsed)
if len(paths) == 0 {
return statement, nil
}

var missingContextOffsets []int
for _, it := range paths {
if _, ok := p.pathContextNames[it.Context]; !ok {
missingContextOffsets = append(missingContextOffsets, it.Pos.Offset)
}
}

return writeStatementWithPathsContext(context, statement, missingContextOffsets), nil
TylerHelmuth marked this conversation as resolved.
Show resolved Hide resolved
}

func writeStatementWithPathsContext(context string, statement string, offsets []int) string {
if len(offsets) == 0 {
return statement
}

contextPrefix := context + "."
var sb strings.Builder
sb.Grow(len(statement) + (len(contextPrefix) * len(offsets)))

left := 0
for i, offset := range offsets {
sb.WriteString(statement[left:offset])
sb.WriteString(contextPrefix)
if i+1 >= len(offsets) {
sb.WriteString(statement[offset:])
} else {
left = offset
}
}

return sb.String()
}
141 changes: 141 additions & 0 deletions pkg/ottl/paths_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,13 @@
package ottl

import (
"context"
"testing"

"github.com/alecthomas/participle/v2/lexer"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component/componenttest"

"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl/ottltest"
)
Expand Down Expand Up @@ -448,3 +451,141 @@ func Test_getBooleanExpressionPaths(t *testing.T) {
paths := getBooleanExpressionPaths(c)
require.Equal(t, expected, paths)
}

func Test_AppendStatementPathsContext_InvalidStatement(t *testing.T) {
ps, err := NewParser(
CreateFactoryMap[any](),
testParsePath[any],
componenttest.NewNopTelemetrySettings(),
WithEnumParser[any](testParseEnum),
WithPathContextNames[any]([]string{"foo", "bar"}),
)
require.NoError(t, err)
_, err = ps.AppendStatementPathsContext("foo", "this is invalid")
require.ErrorContains(t, err, `statement has invalid syntax`)
}

func Test_AppendStatementPathsContext_InvalidContext(t *testing.T) {
ps, err := NewParser(
CreateFactoryMap[any](),
testParsePath[any],
componenttest.NewNopTelemetrySettings(),
WithEnumParser[any](testParseEnum),
WithPathContextNames[any]([]string{"foo", "bar"}),
)
require.NoError(t, err)
_, err = ps.AppendStatementPathsContext("foobar", "set(foo, 1)")
require.ErrorContains(t, err, `unknown context "foobar" for parser`)
}

func Test_AppendStatementPathsContext_Success(t *testing.T) {
type mockSetArguments[K any] struct {
Target Setter[K]
Value Getter[K]
}

mockSetFactory := NewFactory("set", &mockSetArguments[any]{}, func(_ FunctionContext, _ Arguments) (ExprFunc[any], error) {
return func(_ context.Context, _ any) (any, error) {
return nil, nil
}, nil
})

tests := []struct {
name string
statement string
context string
pathContextNames []string
expected string
}{
{
name: "no paths",
statement: `set("foo", 1)`,
context: "bar",
},
{
name: "single path with context",
statement: `set(span.value, 1)`,
context: "span",
},
{
name: "single path without context",
statement: "set(value, 1)",
expected: "set(span.value, 1)",
context: "span",
},
{
name: "single path with context - multiple context names",
statement: "set(span.value, 1)",
pathContextNames: []string{"spanevent", "span"},
context: "spanevent",
},
{
name: "multiple paths with the same context",
statement: `set(span.value, 1) where span.attributes["foo"] == "foo" and span.id == 1`,
pathContextNames: []string{"another", "span"},
context: "another",
},
{
name: "multiple paths with different contexts",
statement: `set(another.value, 1) where span.attributes["foo"] == "foo" and another.id == 1`,
pathContextNames: []string{"another", "span"},
context: "another",
},
{
name: "multiple paths with and without contexts",
statement: `set(value, 1) where span.attributes["foo"] == "foo" and id == 1`,
expected: `set(spanevent.value, 1) where span.attributes["foo"] == "foo" and spanevent.id == 1`,
pathContextNames: []string{"spanevent", "span"},
context: "spanevent",
},
{
name: "multiple paths without context",
statement: `set(value, 1) where name == attributes["foo.name"]`,
expected: `set(span.value, 1) where span.name == span.attributes["foo.name"]`,
context: "span",
},
{
name: "function path parameter without context",
statement: `set(attributes["test"], "pass") where IsMatch(name, "operation[AC]")`,
context: "log",
expected: `set(log.attributes["test"], "pass") where IsMatch(log.name, "operation[AC]")`,
},
{
name: "function path parameter with context",
statement: `set(attributes["test"], "pass") where IsMatch(resource.name, "operation[AC]")`,
context: "log",
pathContextNames: []string{"log", "resource"},
expected: `set(log.attributes["test"], "pass") where IsMatch(resource.name, "operation[AC]")`,
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if len(tt.pathContextNames) == 0 {
tt.pathContextNames = append(tt.pathContextNames, tt.context)
}

ps, err := NewParser(
CreateFactoryMap[any](mockSetFactory),
testParsePath[any],
componenttest.NewNopTelemetrySettings(),
WithEnumParser[any](testParseEnum),
WithPathContextNames[any](tt.pathContextNames),
)

require.NoError(t, err)
require.NotNil(t, ps)

var expected string
if tt.expected != "" {
expected = tt.expected
} else {
expected = tt.statement
}

result, err := ps.AppendStatementPathsContext(tt.context, tt.statement)
require.NoError(t, err)
assert.Equal(t, expected, result)
})
}
}
Loading