Skip to content

Commit a3a9de8

Browse files
bogdandrutubogdandrutu
committed
Use pointer when passing TransformContext around or calling into
Signed-off-by: Bogdan Drutu <[email protected]>
1 parent 16077c6 commit a3a9de8

File tree

42 files changed

+315
-252
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+315
-252
lines changed

‎connector/countconnector/connector.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ type count struct {
3232
component.StartFunc
3333
component.ShutdownFunc
3434

35-
spansMetricDefs map[string]metricDef[ottlspan.TransformContext]
35+
spansMetricDefs map[string]metricDef[*ottlspan.TransformContext]
3636
spanEventsMetricDefs map[string]metricDef[ottlspanevent.TransformContext]
3737
metricsMetricDefs map[string]metricDef[ottlmetric.TransformContext]
3838
dataPointsMetricDefs map[string]metricDef[ottldatapoint.TransformContext]
@@ -51,7 +51,7 @@ func (c *count) ConsumeTraces(ctx context.Context, td ptrace.Traces) error {
5151
for i := 0; i < td.ResourceSpans().Len(); i++ {
5252
resourceSpan := td.ResourceSpans().At(i)
5353
resourceAttrs := resourceSpan.Resource().Attributes()
54-
spansCounter := newCounter[ottlspan.TransformContext](c.spansMetricDefs)
54+
spansCounter := newCounter[*ottlspan.TransformContext](c.spansMetricDefs)
5555
spanEventsCounter := newCounter[ottlspanevent.TransformContext](c.spanEventsMetricDefs)
5656

5757
for j := 0; j < resourceSpan.ScopeSpans().Len(); j++ {
@@ -62,8 +62,9 @@ func (c *count) ConsumeTraces(ctx context.Context, td ptrace.Traces) error {
6262
span := scopeSpan.Spans().At(k)
6363
spansCounter.updateTimestamp(span.StartTimestamp())
6464
spansCounter.updateTimestamp(span.EndTimestamp())
65-
sCtx := ottlspan.NewTransformContext(span, scopeSpan.Scope(), resourceSpan.Resource(), scopeSpan, resourceSpan)
65+
sCtx := ottlspan.BorrowContext(span, scopeSpan.Scope(), resourceSpan.Resource(), scopeSpan, resourceSpan)
6666
multiError = errors.Join(multiError, spansCounter.update(ctx, span.Attributes(), scopeAttrs, resourceAttrs, sCtx))
67+
ottlspan.ReturnContext(sCtx)
6768

6869
for l := 0; l < span.Events().Len(); l++ {
6970
event := span.Events().At(l)

‎connector/countconnector/counter_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import (
1414
)
1515

1616
func Test_update_attributes(t *testing.T) {
17-
spanMetricDefs := make(map[string]metricDef[ottlspan.TransformContext])
18-
spanMetricDefs[defaultMetricNameSpans] = metricDef[ottlspan.TransformContext]{
17+
spanMetricDefs := make(map[string]metricDef[*ottlspan.TransformContext])
18+
spanMetricDefs[defaultMetricNameSpans] = metricDef[*ottlspan.TransformContext]{
1919
desc: defaultMetricDescSpans,
2020
attrs: []AttributeConfig{
2121
{
@@ -129,8 +129,8 @@ func Test_update_attributes(t *testing.T) {
129129

130130
for _, tt := range tests {
131131
t.Run(tt.name, func(t *testing.T) {
132-
spansCounter := newCounter[ottlspan.TransformContext](spanMetricDefs)
133-
err := spansCounter.update(t.Context(), tt.spanAttr, tt.scopeAttr, tt.resourceAttr, ottlspan.TransformContext{})
132+
spansCounter := newCounter[*ottlspan.TransformContext](spanMetricDefs)
133+
err := spansCounter.update(t.Context(), tt.spanAttr, tt.scopeAttr, tt.resourceAttr, &ottlspan.TransformContext{})
134134
require.NoError(t, err)
135135
require.NotNil(t, spansCounter)
136136
m := spansCounter.counts[defaultMetricNameSpans]

‎connector/countconnector/factory.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ func createTracesToMetrics(
5050
) (connector.Traces, error) {
5151
c := cfg.(*Config)
5252

53-
spanMetricDefs := make(map[string]metricDef[ottlspan.TransformContext], len(c.Spans))
53+
spanMetricDefs := make(map[string]metricDef[*ottlspan.TransformContext], len(c.Spans))
5454
for name, info := range c.Spans {
55-
md := metricDef[ottlspan.TransformContext]{
55+
md := metricDef[*ottlspan.TransformContext]{
5656
desc: info.Description,
5757
attrs: info.Attributes,
5858
}

‎connector/routingconnector/functions.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ func standardFunctions[K any]() map[string]ottl.Factory[K] {
3333
return funcs
3434
}
3535

36-
func spanFunctions() map[string]ottl.Factory[ottlspan.TransformContext] {
37-
funcs := standardFunctions[ottlspan.TransformContext]()
36+
func spanFunctions() map[string]ottl.Factory[*ottlspan.TransformContext] {
37+
funcs := standardFunctions[*ottlspan.TransformContext]()
3838

3939
isRootSpan := ottlfuncs.NewIsRootSpanFactory()
4040
funcs[isRootSpan.Name()] = isRootSpan

‎connector/routingconnector/router.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ type consumerProvider[C any] func(...pipeline.ID) (C, error)
3232
// consumer.Logs.
3333
type router[C any] struct {
3434
resourceParser ottl.Parser[ottlresource.TransformContext]
35-
spanParser ottl.Parser[ottlspan.TransformContext]
35+
spanParser ottl.Parser[*ottlspan.TransformContext]
3636
metricParser ottl.Parser[ottlmetric.TransformContext]
3737
dataPointParser ottl.Parser[ottldatapoint.TransformContext]
3838
logParser ottl.Parser[ottllog.TransformContext]
@@ -74,7 +74,7 @@ type routingItem[C any] struct {
7474
consumer C
7575
requestCondition *requestCondition
7676
resourceStatement *ottl.Statement[ottlresource.TransformContext]
77-
spanStatement *ottl.Statement[ottlspan.TransformContext]
77+
spanStatement *ottl.Statement[*ottlspan.TransformContext]
7878
metricStatement *ottl.Statement[ottlmetric.TransformContext]
7979
dataPointStatement *ottl.Statement[ottldatapoint.TransformContext]
8080
logStatement *ottl.Statement[ottllog.TransformContext]

‎connector/routingconnector/traces.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ func (c *tracesConnector) ConsumeTraces(ctx context.Context, td ptrace.Traces) e
8383
case "span":
8484
ptraceutil.MoveSpansWithContextIf(td, matched,
8585
func(rs ptrace.ResourceSpans, ss ptrace.ScopeSpans, s ptrace.Span) bool {
86-
mtx := ottlspan.NewTransformContext(s, ss.Scope(), rs.Resource(), ss, rs)
86+
mtx := ottlspan.BorrowContext(s, ss.Scope(), rs.Resource(), ss, rs)
87+
defer ottlspan.ReturnContext(mtx)
8788
_, isMatch, err := route.spanStatement.Execute(ctx, mtx)
8889
errs = errors.Join(errs, err)
8990
return isMatch

‎connector/signaltometricsconnector/connector.go‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ type signalToMetrics struct {
2929
collectorInstanceInfo model.CollectorInstanceInfo
3030
logger *zap.Logger
3131

32-
spanMetricDefs []model.MetricDef[ottlspan.TransformContext]
32+
spanMetricDefs []model.MetricDef[*ottlspan.TransformContext]
3333
dpMetricDefs []model.MetricDef[ottldatapoint.TransformContext]
3434
logMetricDefs []model.MetricDef[ottllog.TransformContext]
3535
profileMetricDefs []model.MetricDef[ottlprofile.TransformContext]
@@ -49,7 +49,7 @@ func (sm *signalToMetrics) ConsumeTraces(ctx context.Context, td ptrace.Traces)
4949

5050
processedMetrics := pmetric.NewMetrics()
5151
processedMetrics.ResourceMetrics().EnsureCapacity(td.ResourceSpans().Len())
52-
aggregator := aggregator.NewAggregator[ottlspan.TransformContext](processedMetrics)
52+
aggregator := aggregator.NewAggregator[*ottlspan.TransformContext](processedMetrics)
5353

5454
for i := 0; i < td.ResourceSpans().Len(); i++ {
5555
resourceSpan := td.ResourceSpans().At(i)
@@ -67,22 +67,26 @@ func (sm *signalToMetrics) ConsumeTraces(ctx context.Context, td ptrace.Traces)
6767

6868
// The transform context is created from original attributes so that the
6969
// OTTL expressions are also applied on the original attributes.
70-
tCtx := ottlspan.NewTransformContext(span, scopeSpan.Scope(), resourceSpan.Resource(), scopeSpan, resourceSpan)
70+
tCtx := ottlspan.BorrowContext(span, scopeSpan.Scope(), resourceSpan.Resource(), scopeSpan, resourceSpan)
7171
if md.Conditions != nil {
7272
match, err := md.Conditions.Eval(ctx, tCtx)
7373
if err != nil {
74+
ottlspan.ReturnContext(tCtx)
7475
return fmt.Errorf("failed to evaluate conditions: %w", err)
7576
}
7677
if !match {
78+
ottlspan.ReturnContext(tCtx)
7779
sm.logger.Debug("condition not matched, skipping", zap.String("name", md.Key.Name))
7880
continue
7981
}
8082
}
8183

8284
filteredResAttrs := md.FilterResourceAttributes(resourceAttrs, sm.collectorInstanceInfo)
8385
if err := aggregator.Aggregate(ctx, tCtx, md, filteredResAttrs, filteredSpanAttrs, 1); err != nil {
86+
ottlspan.ReturnContext(tCtx)
8487
return err
8588
}
89+
ottlspan.ReturnContext(tCtx)
8690
}
8791
}
8892
}

‎connector/signaltometricsconnector/factory.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ func createTracesToMetrics(
5050
return nil, fmt.Errorf("failed to create OTTL statement parser for spans: %w", err)
5151
}
5252

53-
metricDefs := make([]model.MetricDef[ottlspan.TransformContext], 0, len(c.Spans))
53+
metricDefs := make([]model.MetricDef[*ottlspan.TransformContext], 0, len(c.Spans))
5454
for i := range c.Spans {
5555
info := c.Spans[i]
56-
var md model.MetricDef[ottlspan.TransformContext]
56+
var md model.MetricDef[*ottlspan.TransformContext]
5757
if err := md.FromMetricInfo(info, parser, set.TelemetrySettings); err != nil {
5858
return nil, fmt.Errorf("failed to parse provided metric information; %w", err)
5959
}

‎connector/signaltometricsconnector/internal/customottl/adjustedcount.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ import (
1212
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/sampling"
1313
)
1414

15-
func NewAdjustedCountFactory() ottl.Factory[ottlspan.TransformContext] {
15+
func NewAdjustedCountFactory() ottl.Factory[*ottlspan.TransformContext] {
1616
return ottl.NewFactory("AdjustedCount", nil, createAdjustedCountFunction)
1717
}
1818

19-
func createAdjustedCountFunction(ottl.FunctionContext, ottl.Arguments) (ottl.ExprFunc[ottlspan.TransformContext], error) {
19+
func createAdjustedCountFunction(ottl.FunctionContext, ottl.Arguments) (ottl.ExprFunc[*ottlspan.TransformContext], error) {
2020
return adjustedCount()
2121
}
2222

23-
func adjustedCount() (ottl.ExprFunc[ottlspan.TransformContext], error) {
24-
return func(_ context.Context, tCtx ottlspan.TransformContext) (any, error) {
23+
func adjustedCount() (ottl.ExprFunc[*ottlspan.TransformContext], error) {
24+
return func(_ context.Context, tCtx *ottlspan.TransformContext) (any, error) {
2525
tracestate := tCtx.GetSpan().TraceState().AsRaw()
2626
w3cTraceState, err := sampling.NewW3CTraceState(tracestate)
2727
if err != nil {

‎connector/signaltometricsconnector/internal/customottl/adjustedcount_test.go‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,9 @@ func Test_AdjustedCount(t *testing.T) {
3333
require.NoError(t, err)
3434
span := ptrace.NewSpan()
3535
span.TraceState().FromRaw(tc.tracestate)
36-
result, err := exprFunc(nil, ottlspan.NewTransformContext(
37-
span,
38-
pcommon.NewInstrumentationScope(),
39-
pcommon.NewResource(),
40-
ptrace.NewScopeSpans(),
41-
ptrace.NewResourceSpans(),
42-
))
36+
tCtx := ottlspan.BorrowContext(span, pcommon.NewInstrumentationScope(), pcommon.NewResource(), ptrace.NewScopeSpans(), ptrace.NewResourceSpans())
37+
defer ottlspan.ReturnContext(tCtx)
38+
result, err := exprFunc(nil, tCtx)
4339
if tc.errMsg != "" {
4440
require.ErrorContains(t, err, tc.errMsg)
4541
return

0 commit comments

Comments
 (0)