-
Notifications
You must be signed in to change notification settings - Fork 3k
feat(ottl): Add a new ottl trim function that trims leading and trailing whitespace from a string #36400
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
Merged
TylerHelmuth
merged 10 commits into
open-telemetry:main
from
rnishtala-sumo:ottl-trim-function
Dec 20, 2024
Merged
feat(ottl): Add a new ottl trim function that trims leading and trailing whitespace from a string #36400
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
b2c24fd
feat(ottl): Add a new ottl trim function that trims leading and trail…
rnishtala-sumo d088773
Adding an option to specify the string to trim
rnishtala-sumo 5f20a1d
Added condition to check if the replace argument is empty
rnishtala-sumo 8a4dc98
Indicate that replacement is an optional parameter
rnishtala-sumo 1d8e1dd
If the user doesn't enter a replacement string or sets it to "", then…
rnishtala-sumo 5167e4c
Update pkg/ottl/ottlfuncs/func_trim.go
TylerHelmuth 695e800
fix: Use a default cut string of ' ' when replacement is empty
rnishtala-sumo 3d42a4c
Update pkg/ottl/ottlfuncs/func_trim.go
TylerHelmuth b78e86e
Merge branch 'main' into ottl-trim-function
TylerHelmuth c8c0626
Update pkg/ottl/ottlfuncs/README.md
evan-bradley File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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: ottl | ||
|
||
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). | ||
note: Add a new ottl trim function that trims leading and trailing characters from a string (default- whitespace). | ||
|
||
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. | ||
issues: [34100] | ||
|
||
# (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: [] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
// Copyright The OpenTelemetry Authors | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
package ottlfuncs // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl/ottlfuncs" | ||
|
||
import ( | ||
"context" | ||
"fmt" | ||
"strings" | ||
|
||
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl" | ||
) | ||
|
||
type TrimArguments[K any] struct { | ||
Target ottl.StringGetter[K] | ||
Replacement ottl.Optional[string] | ||
} | ||
|
||
func NewTrimFactory[K any]() ottl.Factory[K] { | ||
return ottl.NewFactory("Trim", &TrimArguments[K]{}, createTrimFunction[K]) | ||
} | ||
|
||
func createTrimFunction[K any](_ ottl.FunctionContext, oArgs ottl.Arguments) (ottl.ExprFunc[K], error) { | ||
args, ok := oArgs.(*TrimArguments[K]) | ||
|
||
if !ok { | ||
return nil, fmt.Errorf("TrimFactory args must be of type *TrimArguments[K]") | ||
} | ||
|
||
return trim(args.Target, args.Replacement), nil | ||
} | ||
|
||
func trim[K any](target ottl.StringGetter[K], replacement ottl.Optional[string]) ottl.ExprFunc[K] { | ||
return func(ctx context.Context, tCtx K) (any, error) { | ||
replacementString := replacement.Get() | ||
TylerHelmuth marked this conversation as resolved.
Show resolved
Hide resolved
|
||
val, err := target.Get(ctx, tCtx) | ||
if err != nil { | ||
return nil, err | ||
} | ||
return strings.Trim(val, replacementString), nil | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,80 @@ | ||
// Copyright The OpenTelemetry Authors | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
package ottlfuncs | ||
|
||
import ( | ||
"context" | ||
"testing" | ||
|
||
"github.com/stretchr/testify/assert" | ||
|
||
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl" | ||
) | ||
|
||
func Test_trim(t *testing.T) { | ||
tests := []struct { | ||
name string | ||
target ottl.StringGetter[any] | ||
replacement ottl.Optional[string] | ||
expected any | ||
shouldError bool | ||
}{ | ||
{ | ||
name: "trim string", | ||
target: &ottl.StandardStringGetter[any]{ | ||
Getter: func(_ context.Context, _ any) (any, error) { | ||
return " this is a test ", nil | ||
}, | ||
}, | ||
replacement: ottl.NewTestingOptional[string](" "), | ||
expected: "this is a test", | ||
shouldError: false, | ||
}, | ||
{ | ||
name: "trim empty string", | ||
target: &ottl.StandardStringGetter[any]{ | ||
Getter: func(_ context.Context, _ any) (any, error) { | ||
return "", nil | ||
}, | ||
}, | ||
replacement: ottl.NewTestingOptional[string](" "), | ||
expected: "", | ||
shouldError: false, | ||
}, | ||
{ | ||
name: "No replacement string", | ||
target: &ottl.StandardStringGetter[any]{ | ||
Getter: func(_ context.Context, _ any) (any, error) { | ||
return " this is a test ", nil | ||
}, | ||
}, | ||
replacement: ottl.Optional[string]{}, | ||
expected: " this is a test ", | ||
shouldError: false, | ||
}, | ||
{ | ||
name: "Set replacement string to \"\"", | ||
target: &ottl.StandardStringGetter[any]{ | ||
Getter: func(_ context.Context, _ any) (any, error) { | ||
return " this is a test ", nil | ||
}, | ||
}, | ||
replacement: ottl.NewTestingOptional[string](""), | ||
expected: " this is a test ", | ||
shouldError: false, | ||
}, | ||
} | ||
for _, tt := range tests { | ||
t.Run(tt.name, func(t *testing.T) { | ||
exprFunc := trim(tt.target, tt.replacement) | ||
result, err := exprFunc(nil, nil) | ||
if tt.shouldError { | ||
assert.Error(t, err) | ||
return | ||
} | ||
assert.NoError(t, err) | ||
assert.Equal(t, tt.expected, result) | ||
}) | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.