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 isList OTTL Function #32392

Merged
merged 16 commits into from
Apr 17, 2024
Merged
Show file tree
Hide file tree
Changes from 12 commits
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
22 changes: 22 additions & 0 deletions .chloggen/ottl-islist.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# 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 `IsList` OTTL Function

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

# 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]
6 changes: 6 additions & 0 deletions pkg/ottl/e2e/e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,12 @@ func Test_e2e_converters(t *testing.T) {
tCtx.GetLogRecord().Attributes().PutStr("test", "pass")
},
},
{
statement: `set(attributes["test"], "pass") where IsList(attributes["foo"]["slice"])`,
want: func(tCtx ottllog.TransformContext) {
tCtx.GetLogRecord().Attributes().PutStr("test", "pass")
},
},
{
statement: `set(attributes["test"], "pass") where IsMatch("aa123bb", "\\d{3}")`,
want: func(tCtx ottllog.TransformContext) {
Expand Down
17 changes: 17 additions & 0 deletions pkg/ottl/ottlfuncs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,7 @@ Available Converters:
- [IsInt](#isint)
- [IsMap](#ismap)
- [IsMatch](#ismatch)
- [IsList](#islist)
- [IsString](#isstring)
- [Len](#len)
- [Log](#log)
Expand Down Expand Up @@ -708,6 +709,22 @@ Examples:

- `IsMatch("string", ".*ring")`

### IsList

`IsList(value)`

The `IsList` Converter returns true if the given value is a list.

The `value` is either a path expression to a telemetry field to retrieve or a literal.

If `value` is a `list`, `pcommon.ValueTypeSlice`. `pcommon.Slice`, or any other list type, then returns `true`, otherwise returns `false`.

Examples:

- `IsList(body)`

- `IsList(attributes["maybe a slice"])`

### IsString

`IsString(value)`
Expand Down
58 changes: 58 additions & 0 deletions pkg/ottl/ottlfuncs/func_is_list.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
// 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"

"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/plog"
"go.opentelemetry.io/collector/pdata/pmetric"
"go.opentelemetry.io/collector/pdata/ptrace"

"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl"
)

type IsListArguments[K any] struct {
Target ottl.Getter[K]
}

func NewIsListFactory[K any]() ottl.Factory[K] {
return ottl.NewFactory("IsList", &IsListArguments[K]{}, createIsListFunction[K])
}

func createIsListFunction[K any](_ ottl.FunctionContext, oArgs ottl.Arguments) (ottl.ExprFunc[K], error) {
args, ok := oArgs.(*IsListArguments[K])

if !ok {
return nil, fmt.Errorf("IsListFactory args must be of type *IsListArguments[K]")
}

return isList(args.Target), nil
}

func isList[K any](target ottl.Getter[K]) ottl.ExprFunc[K] {
return func(ctx context.Context, tCtx K) (interface{}, error) {
strawgate marked this conversation as resolved.
Show resolved Hide resolved
val, err := target.Get(ctx, tCtx)
if err != nil {
return false, err
}

switch valType := val.(type) {

strawgate marked this conversation as resolved.
Show resolved Hide resolved
case pcommon.Value:
switch valType.Type() {
case pcommon.ValueTypeSlice:
return true, nil
}
return false, nil

case pcommon.Slice, plog.LogRecordSlice, plog.ResourceLogsSlice, plog.ScopeLogsSlice, pmetric.ExemplarSlice, pmetric.ExponentialHistogramDataPointSlice, pmetric.HistogramDataPointSlice, pmetric.MetricSlice, pmetric.NumberDataPointSlice, pmetric.ResourceMetricsSlice, pmetric.ScopeMetricsSlice, pmetric.SummaryDataPointSlice, pmetric.SummaryDataPointValueAtQuantileSlice, ptrace.ResourceSpansSlice, ptrace.ScopeSpansSlice, ptrace.SpanEventSlice, ptrace.SpanLinkSlice, ptrace.SpanSlice, []string, []bool, []int64, []float64, [][]byte, []any:
return true, nil
}

return false, nil
}
}
189 changes: 189 additions & 0 deletions pkg/ottl/ottlfuncs/func_is_list_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,189 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

package ottlfuncs

import (
"context"
"testing"

"github.com/stretchr/testify/assert"
"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/plog"
"go.opentelemetry.io/collector/pdata/pmetric"
"go.opentelemetry.io/collector/pdata/ptrace"

"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl"
)

func Test_IsList(t *testing.T) {
tests := []struct {
name string
value interface{}
expected bool
}{
{
name: "map",
value: make(map[string]any, 0),
expected: false,
},
{
name: "ValueTypeMap",
value: pcommon.NewValueMap(),
expected: false,
},
{
name: "not map",
value: "not a map",
expected: false,
},
{
name: "ValueTypeSlice",
value: pcommon.NewValueSlice(),
expected: true,
},
{
name: "nil",
value: nil,
expected: false,
},
{
name: "plog.LogRecordSlice",
value: plog.NewLogRecordSlice(),
expected: true,
},
{
name: "plog.ResourceLogsSlice",
value: plog.NewResourceLogsSlice(),
expected: true,
},
{
name: "plog.ScopeLogsSlice",
value: plog.NewScopeLogsSlice(),
expected: true,
},
{
name: "pmetric.ExemplarSlice",
value: pmetric.NewExemplarSlice(),
expected: true,
},
{
name: "pmetric.ExponentialHistogramDataPointSlice",
value: pmetric.NewExponentialHistogramDataPointSlice(),
expected: true,
},
{
name: "pmetric.HistogramDataPointSlice",
value: pmetric.NewHistogramDataPointSlice(),
expected: true,
},
{
name: "pmetric.MetricSlice",
value: pmetric.NewMetricSlice(),
expected: true,
},
{
name: "pmetric.NumberDataPointSlice",
value: pmetric.NewNumberDataPointSlice(),
expected: true,
},
{
name: "pmetric.ResourceMetricsSlice",
value: pmetric.NewResourceMetricsSlice(),
expected: true,
},
{
name: "pmetric.ScopeMetricsSlice",
value: pmetric.NewScopeMetricsSlice(),
expected: true,
},
{
name: "pmetric.SummaryDataPointSlice",
value: pmetric.NewSummaryDataPointSlice(),
expected: true,
},
{
name: "pmetric.SummaryDataPointValueAtQuantileSlice",
value: pmetric.NewSummaryDataPointValueAtQuantileSlice(),
expected: true,
},
{
name: "ptrace.ResourceSpansSlice",
value: ptrace.NewResourceSpansSlice(),
expected: true,
},
{
name: "ptrace.ScopeSpansSlice",
value: ptrace.NewScopeSpansSlice(),
expected: true,
},
{
name: "ptrace.SpanEventSlice",
value: ptrace.NewSpanEventSlice(),
expected: true,
},
{
name: "ptrace.SpanLinkSlice",
value: ptrace.NewSpanLinkSlice(),
expected: true,
},
{
name: "ptrace.SpanSlice",
value: ptrace.NewSpanSlice(),
expected: true,
},
{
name: "[]string",
value: []string{},
expected: true,
},
{
name: "[]bool",
value: []bool{},
expected: true,
},
{
name: "[]int64",
value: []int64{},
expected: true,
},
{
name: "[]float64",
value: []float64{},
expected: true,
},
{
name: "[][]byte",
value: [][]byte{},
expected: true,
},
{
name: "[]any",
value: []any{},
expected: true,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
exprFunc := isList[any](&ottl.StandardGetSetter[any]{
Getter: func(context.Context, interface{}) (interface{}, error) {
return tt.value, nil
},
})
result, err := exprFunc(context.Background(), nil)
assert.NoError(t, err)
assert.Equal(t, tt.expected, result)
})
}
}

func Test_IsList_Error(t *testing.T) {
exprFunc := isList[any](&ottl.StandardGetSetter[any]{
Getter: func(context.Context, interface{}) (interface{}, error) {
return nil, ottl.TypeError("")
},
})
result, err := exprFunc(context.Background(), nil)
assert.Equal(t, false, result)
assert.IsType(t, ottl.TypeError(""), err)
}
1 change: 1 addition & 0 deletions pkg/ottl/ottlfuncs/functions.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ func converters[K any]() []ottl.Factory[K] {
NewIntFactory[K](),
NewIsBoolFactory[K](),
NewIsDoubleFactory[K](),
NewIsListFactory[K](),
NewIsIntFactory[K](),
NewIsMapFactory[K](),
NewIsMatchFactory[K](),
Expand Down