-
Notifications
You must be signed in to change notification settings - Fork 2.8k
[pkg/ottl] Add function ProfileID() #39587
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
atoulme
merged 7 commits into
open-telemetry:main
from
rockdaboot:profiles-add-ProfileID-func
Apr 29, 2025
Merged
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
9a6c758
[pkg/ottl] Add function ProfileID()
rockdaboot b85d851
README.md: Use a valid example for ProfileID
rockdaboot 190e5bc
Add tests and check for an invalid ProfileID (all zeroes)
rockdaboot f1f9628
Add e2e test for ProfileID()
rockdaboot 3414e5d
Fix linter
rockdaboot 967bf08
Allow empty values for converter ProfileID
rockdaboot 828185d
Merge branch 'main' into profiles-add-ProfileID-func
rockdaboot 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: pkg/ottl | ||
|
||
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). | ||
note: Add the OTTL function ProfileID() | ||
|
||
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. | ||
issues: [39587] | ||
|
||
# (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: [user] |
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
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,50 @@ | ||
// 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" | ||
"errors" | ||
"fmt" | ||
|
||
"go.opentelemetry.io/collector/pdata/pprofile" | ||
|
||
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl" | ||
) | ||
|
||
type ProfileIDArguments[K any] struct { | ||
Bytes []byte | ||
} | ||
|
||
func NewProfileIDFactory[K any]() ottl.Factory[K] { | ||
return ottl.NewFactory("ProfileID", &ProfileIDArguments[K]{}, createProfileIDFunction[K]) | ||
} | ||
|
||
func createProfileIDFunction[K any](_ ottl.FunctionContext, oArgs ottl.Arguments) (ottl.ExprFunc[K], error) { | ||
args, ok := oArgs.(*ProfileIDArguments[K]) | ||
|
||
if !ok { | ||
return nil, errors.New("ProfileIDFactory args must be of type *ProfileIDArguments[K]") | ||
} | ||
|
||
return profileID[K](args.Bytes) | ||
} | ||
|
||
var emptyProfileID = pprofile.NewProfileIDEmpty() | ||
|
||
func profileID[K any](bytes []byte) (ottl.ExprFunc[K], error) { | ||
if len(bytes) != len(emptyProfileID) { | ||
return nil, fmt.Errorf("profile ids must be %d bytes", len(emptyProfileID)) | ||
} | ||
if pprofile.ProfileID(bytes) == emptyProfileID { | ||
return nil, errors.New("profile ids cannot be all zeroes") | ||
} | ||
|
||
id := pprofile.ProfileID{} | ||
copy(id[:], bytes) | ||
|
||
return func(context.Context, K) (any, error) { | ||
return id, nil | ||
}, 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,71 @@ | ||
// Copyright The OpenTelemetry Authors | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
package ottlfuncs | ||
|
||
import ( | ||
"testing" | ||
|
||
"github.com/stretchr/testify/assert" | ||
"github.com/stretchr/testify/require" | ||
"go.opentelemetry.io/collector/pdata/pprofile" | ||
) | ||
|
||
func Test_profileID(t *testing.T) { | ||
tests := []struct { | ||
name string | ||
bytes []byte | ||
want pprofile.ProfileID | ||
}{ | ||
{ | ||
name: "create profile id", | ||
bytes: []byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}, | ||
want: pprofile.ProfileID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}), | ||
}, | ||
} | ||
for _, tt := range tests { | ||
t.Run(tt.name, func(t *testing.T) { | ||
exprFunc, err := profileID[any](tt.bytes) | ||
assert.NoError(t, err) | ||
result, err := exprFunc(nil, nil) | ||
assert.NoError(t, err) | ||
assert.Equal(t, tt.want, result) | ||
}) | ||
} | ||
} | ||
|
||
func Test_profileID_validation(t *testing.T) { | ||
tests := []struct { | ||
name string | ||
bytes []byte | ||
err string | ||
}{ | ||
{ | ||
name: "nil profile id", | ||
bytes: nil, | ||
err: "profile ids must be 16 bytes", | ||
}, | ||
{ | ||
name: "invalid profile id", | ||
bytes: make([]byte, 16), | ||
err: "profile ids cannot be all zeroes", | ||
}, | ||
{ | ||
name: "byte slice less than 16", | ||
bytes: []byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}, | ||
err: "profile ids must be 16 bytes", | ||
}, | ||
{ | ||
name: "byte slice longer than 16", | ||
bytes: []byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17}, | ||
err: "profile ids must be 16 bytes", | ||
}, | ||
} | ||
for _, tt := range tests { | ||
t.Run(tt.name, func(t *testing.T) { | ||
_, err := profileID[any](tt.bytes) | ||
require.Error(t, err) | ||
assert.ErrorContains(t, err, tt.err) | ||
}) | ||
} | ||
} |
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.