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

[processor/transform] Instrument the transform processor to emit traces #33508

Merged
Show file tree
Hide file tree
Changes from 10 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
27 changes: 27 additions & 0 deletions .chloggen/ottl-emit-traces.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: Emit traces for statement sequence executions to troubleshoot OTTL statements/conditions

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

# (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: []
18 changes: 18 additions & 0 deletions pkg/ottl/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -151,3 +151,21 @@ service:
2024-05-29T16:38:09.600-0600 debug [email protected]/parser.go:268 TransformContext after statement execution {"kind": "processor", "name": "transform", "pipeline": "logs", "statement": "set(instrumentation_scope.attributes[\"test\"], [\"pass\"])", "condition matched": true, "TransformContext": {"resource": {"attributes": {"test": "pass"}, "dropped_attribute_count": 0}, "scope": {"attributes": {"test": ["pass"]}, "dropped_attribute_count": 0, "name": "", "version": ""}, "log_record": {"attributes": {"log.file.name": "test.log"}, "body": "test", "dropped_attribute_count": 0, "flags": 0, "observed_time_unix_nano": 1717022289500721000, "severity_number": 0, "severity_text": "", "span_id": "", "time_unix_nano": 0, "trace_id": ""}, "cache": {}}}
2024-05-29T16:38:09.601-0600 debug [email protected]/parser.go:268 TransformContext after statement execution {"kind": "processor", "name": "transform", "pipeline": "logs", "statement": "set(attributes[\"test\"], true)", "condition matched": true, "TransformContext": {"resource": {"attributes": {"test": "pass"}, "dropped_attribute_count": 0}, "scope": {"attributes": {"test": ["pass"]}, "dropped_attribute_count": 0, "name": "", "version": ""}, "log_record": {"attributes": {"log.file.name": "test.log", "test": true}, "body": "test", "dropped_attribute_count": 0, "flags": 0, "observed_time_unix_nano": 1717022289500721000, "severity_number": 0, "severity_text": "", "span_id": "", "time_unix_nano": 0, "trace_id": ""}, "cache": {}}}
```

If configured to do so, the collector also emits traces for the execution of OTTL statement sequences.
These traces contain spans for the execution of each statement, including the statement itself and whether it has
been applied or not. To make use of this, enable the self monitoring of the collector by setting the
`--feature-gates=telemetry.useOtelWithSDKConfigurationForInternalTelemetry` flag, and using the following configuration
to export the traces to e.g. an OTLP API endpoint:

```yaml
service:
telemetry:
traces:
processors:
- batch:
exporter:
otlp:
protocol: http/protobuf
endpoint: ${env:OTLP_ENDPOINT}/v1/traces
```
4 changes: 2 additions & 2 deletions pkg/ottl/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ require (
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.102.2-0.20240611143128-7dfb57b9ad1c
go.opentelemetry.io/collector/pdata v1.9.1-0.20240611143128-7dfb57b9ad1c
go.opentelemetry.io/otel v1.27.0
go.opentelemetry.io/otel/sdk v1.27.0
go.opentelemetry.io/otel/trace v1.27.0
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.27.0
Expand All @@ -36,10 +38,8 @@ require (
github.com/prometheus/common v0.54.0 // indirect
github.com/prometheus/procfs v0.15.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.102.2-0.20240611143128-7dfb57b9ad1c // indirect
go.opentelemetry.io/otel v1.27.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.49.0 // indirect
go.opentelemetry.io/otel/metric v1.27.0 // indirect
go.opentelemetry.io/otel/sdk v1.27.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.27.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/sys v0.21.0 // indirect
Expand Down
29 changes: 28 additions & 1 deletion pkg/ottl/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import (

"github.com/alecthomas/participle/v2"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/codes"
"go.uber.org/zap"
)

Expand Down Expand Up @@ -262,20 +264,45 @@ func NewStatementSequence[K any](statements []*Statement[K], telemetrySettings c
// When the ErrorMode of the StatementSequence is `ignore`, errors are logged and execution continues to the next statement.
// When the ErrorMode of the StatementSequence is `silent`, errors are not logged and execution continues to the next statement.
func (s *StatementSequence[K]) Execute(ctx context.Context, tCtx K) error {
tracer := s.telemetrySettings.TracerProvider.Tracer("ottl")
TylerHelmuth marked this conversation as resolved.
Show resolved Hide resolved
ctx, sequenceSpan := tracer.Start(ctx, "ottl/StatementSequenceExecution")
defer sequenceSpan.End()
s.telemetrySettings.Logger.Debug("initial TransformContext", zap.Any("TransformContext", tCtx))
for _, statement := range s.statements {
_, condition, err := statement.Execute(ctx, tCtx)
statementCtx, statementSpan := tracer.Start(ctx, "ottl/StatementExecution")
statementSpan.SetAttributes(
attribute.KeyValue{
Key: "statement",
Value: attribute.StringValue(statement.origText),
},
)
_, condition, err := statement.Execute(statementCtx, tCtx)
statementSpan.SetAttributes(
attribute.KeyValue{
Key: "condition_matched",
TylerHelmuth marked this conversation as resolved.
Show resolved Hide resolved
Value: attribute.BoolValue(condition),
},
)
s.telemetrySettings.Logger.Debug("TransformContext after statement execution", zap.String("statement", statement.origText), zap.Bool("condition matched", condition), zap.Any("TransformContext", tCtx))
if err != nil {
statementSpan.RecordError(err)
errMsg := fmt.Sprintf("failed to execute statement '%s': %v", statement.origText, err)
statementSpan.SetStatus(codes.Error, errMsg)
if s.errorMode == PropagateError {
sequenceSpan.SetStatus(codes.Error, errMsg)
statementSpan.End()
err = fmt.Errorf("failed to execute statement: %v, %w", statement.origText, err)
return err
}
if s.errorMode == IgnoreError {
s.telemetrySettings.Logger.Warn("failed to execute statement", zap.Error(err), zap.String("statement", statement.origText))
}
} else {
statementSpan.SetStatus(codes.Ok, "statement executed successfully")
}
statementSpan.End()
}
sequenceSpan.SetStatus(codes.Ok, "statement sequence executed successfully")
return nil
}

Expand Down
183 changes: 179 additions & 4 deletions pkg/ottl/parser_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,12 @@ import (
"time"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/codes"
"go.opentelemetry.io/otel/sdk/trace"
"go.opentelemetry.io/otel/sdk/trace/tracetest"

"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl/ottltest"
)
Expand Down Expand Up @@ -2049,10 +2054,11 @@ func Test_Condition_Eval(t *testing.T) {

func Test_Statements_Execute_Error(t *testing.T) {
tests := []struct {
name string
condition boolExpressionEvaluator[any]
function ExprFunc[any]
errorMode ErrorMode
name string
condition boolExpressionEvaluator[any]
function ExprFunc[any]
errorMode ErrorMode
expectedSpans []expectedSpan
}{
{
name: "IgnoreError error from condition",
Expand All @@ -2063,6 +2069,31 @@ func Test_Statements_Execute_Error(t *testing.T) {
return 1, nil
},
errorMode: IgnoreError,
expectedSpans: []expectedSpan{
{
name: "ottl/StatementExecution",
attributes: []attribute.KeyValue{
{
Key: "statement",
Value: attribute.StringValue("test"),
},
{
Key: "condition_matched",
Value: attribute.BoolValue(false),
},
},
status: trace.Status{
Code: codes.Error,
Description: "failed to execute statement 'test': test",
},
},
{
name: "ottl/StatementSequenceExecution",
status: trace.Status{
Code: codes.Ok,
},
},
},
},
{
name: "PropagateError error from condition",
Expand All @@ -2073,6 +2104,32 @@ func Test_Statements_Execute_Error(t *testing.T) {
return 1, nil
},
errorMode: PropagateError,
expectedSpans: []expectedSpan{
{
name: "ottl/StatementExecution",
attributes: []attribute.KeyValue{
{
Key: "statement",
Value: attribute.StringValue("test"),
},
{
Key: "condition_matched",
Value: attribute.BoolValue(false),
},
},
status: trace.Status{
Code: codes.Error,
Description: "failed to execute statement 'test': test",
},
},
{
name: "ottl/StatementSequenceExecution",
status: trace.Status{
Code: codes.Error,
Description: "failed to execute statement 'test': test",
},
},
},
},
{
name: "IgnoreError error from function",
Expand All @@ -2083,6 +2140,31 @@ func Test_Statements_Execute_Error(t *testing.T) {
return 1, fmt.Errorf("test")
},
errorMode: IgnoreError,
expectedSpans: []expectedSpan{
{
name: "ottl/StatementExecution",
attributes: []attribute.KeyValue{
{
Key: "statement",
Value: attribute.StringValue("test"),
},
{
Key: "condition_matched",
Value: attribute.BoolValue(true),
},
},
status: trace.Status{
Code: codes.Error,
Description: "failed to execute statement 'test': test",
},
},
{
name: "ottl/StatementSequenceExecution",
status: trace.Status{
Code: codes.Ok,
},
},
},
},
{
name: "PropagateError error from function",
Expand All @@ -2093,6 +2175,32 @@ func Test_Statements_Execute_Error(t *testing.T) {
return 1, fmt.Errorf("test")
},
errorMode: PropagateError,
expectedSpans: []expectedSpan{
{
name: "ottl/StatementExecution",
attributes: []attribute.KeyValue{
{
Key: "statement",
Value: attribute.StringValue("test"),
},
{
Key: "condition_matched",
Value: attribute.BoolValue(true),
},
},
status: trace.Status{
Code: codes.Error,
Description: "failed to execute statement 'test': test",
},
},
{
name: "ottl/StatementSequenceExecution",
status: trace.Status{
Code: codes.Error,
Description: "failed to execute statement 'test': test",
},
},
},
},
{
name: "SilentError error from condition",
Expand All @@ -2103,6 +2211,31 @@ func Test_Statements_Execute_Error(t *testing.T) {
return 1, nil
},
errorMode: SilentError,
expectedSpans: []expectedSpan{
{
name: "ottl/StatementExecution",
attributes: []attribute.KeyValue{
{
Key: "statement",
Value: attribute.StringValue("test"),
},
{
Key: "condition_matched",
Value: attribute.BoolValue(false),
},
},
status: trace.Status{
Code: codes.Error,
Description: "failed to execute statement 'test': test",
},
},
{
name: "ottl/StatementSequenceExecution",
status: trace.Status{
Code: codes.Ok,
},
},
},
},
{
name: "SilentError error from function",
Expand All @@ -2113,6 +2246,31 @@ func Test_Statements_Execute_Error(t *testing.T) {
return 1, fmt.Errorf("test")
},
errorMode: SilentError,
expectedSpans: []expectedSpan{
{
name: "ottl/StatementExecution",
attributes: []attribute.KeyValue{
{
Key: "statement",
Value: attribute.StringValue("test"),
},
{
Key: "condition_matched",
Value: attribute.BoolValue(true),
},
},
status: trace.Status{
Code: codes.Error,
Description: "failed to execute statement 'test': test",
},
},
{
name: "ottl/StatementSequenceExecution",
status: trace.Status{
Code: codes.Ok,
},
},
},
},
}
for _, tt := range tests {
Expand All @@ -2122,18 +2280,29 @@ func Test_Statements_Execute_Error(t *testing.T) {
{
condition: BoolExpr[any]{tt.condition},
function: Expr[any]{exprFunc: tt.function},
origText: "test",
},
},
errorMode: tt.errorMode,
telemetrySettings: componenttest.NewNopTelemetrySettings(),
}
spanRecorder := tracetest.NewSpanRecorder()
statements.telemetrySettings.TracerProvider = trace.NewTracerProvider(trace.WithSpanProcessor(spanRecorder))

err := statements.Execute(context.Background(), nil)
if tt.errorMode == PropagateError {
assert.Error(t, err)
} else {
assert.NoError(t, err)
}

require.Len(t, spanRecorder.Ended(), len(tt.expectedSpans))

for i, es := range tt.expectedSpans {
require.Equal(t, es.name, spanRecorder.Ended()[i].Name())
require.Equal(t, es.attributes, spanRecorder.Ended()[i].Attributes())
require.Equal(t, es.status, spanRecorder.Ended()[i].Status())
}
})
}
}
Expand Down Expand Up @@ -2337,3 +2506,9 @@ func Test_ConditionSequence_Eval_Error(t *testing.T) {
})
}
}

type expectedSpan struct {
name string
attributes []attribute.KeyValue
status trace.Status
}