Skip to content
Closed
Show file tree
Hide file tree
Changes from 3 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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm

## [Unreleased]

### Added

- Support for the `OnEnding` callback in span processors. (#5756)

### Fixed

- Fix memory leak in the global `MeterProvider` when identical instruments are repeatedly created. (#5754)
Expand Down
14 changes: 14 additions & 0 deletions sdk/internal/x/onending_processor.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

package x // import "go.opentelemetry.io/otel/sdk/internal/x"

import "go.opentelemetry.io/otel/trace"

// OnEndingSpanProcessor represents span processors that allow mutating spans
// just before they are ended and made immutable.
type OnEndingSpanProcessor interface {
// OnEnding is called while the span is finished, and while spans are still
// mutable. It is called synchronously and cannot block.
OnEnding(trace.Span)
}
18 changes: 14 additions & 4 deletions sdk/trace/span.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"go.opentelemetry.io/otel/codes"
"go.opentelemetry.io/otel/internal/global"
"go.opentelemetry.io/otel/sdk/instrumentation"
"go.opentelemetry.io/otel/sdk/internal/x"
"go.opentelemetry.io/otel/sdk/resource"
semconv "go.opentelemetry.io/otel/semconv/v1.26.0"
"go.opentelemetry.io/otel/trace"
Expand Down Expand Up @@ -120,6 +121,9 @@ type recordingSpan struct {
// value of time.Time until the span is ended.
endTime time.Time

// hasEnded records whether the span is fully ended.
hasEnded bool

// status is the status of this span.
status Status

Expand Down Expand Up @@ -171,10 +175,8 @@ func (s *recordingSpan) IsRecording() bool {
if s == nil {
return false
}
s.mu.Lock()
defer s.mu.Unlock()

return s.endTime.IsZero()
return !s.hasEnded
}

// SetStatus sets the status of the Span in the form of a code and a
Expand Down Expand Up @@ -417,7 +419,6 @@ func (s *recordingSpan) End(options ...trace.SpanEndOption) {
}

s.mu.Lock()
// Setting endTime to non-zero marks the span as ended and not recording.
if config.Timestamp().IsZero() {
s.endTime = et
} else {
Expand All @@ -426,6 +427,15 @@ func (s *recordingSpan) End(options ...trace.SpanEndOption) {
s.mu.Unlock()

sps := s.tracer.provider.getSpanProcessors()
for _, sp := range sps {
if oesp, ok := sp.sp.(x.OnEndingSpanProcessor); ok {
oesp.OnEnding(s)
}
}
s.mu.Lock()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This acquires the lock twice. Can this be avoided instead?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not really, as we need to set the end time, and later on, mark the span as having ended.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is going to impact the performance of users who are not using the experimental feature. We need to look into alternatives.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've changed to only lock once if there are no onending processors.

s.hasEnded = true
s.mu.Unlock()

if len(sps) == 0 {
return
}
Expand Down
21 changes: 21 additions & 0 deletions sdk/trace/span_processor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,13 @@ func (t *testSpanProcessor) OnStart(parent context.Context, s sdktrace.ReadWrite
t.spansStarted = append(t.spansStarted, s)
}

func (t *testSpanProcessor) OnEnding(s trace.Span) {
if t == nil {
return
}
s.SetAttributes(attribute.Bool("OnEnding", true))
}

func (t *testSpanProcessor) OnEnd(s sdktrace.ReadOnlySpan) {
if t == nil {
return
Expand Down Expand Up @@ -130,6 +137,17 @@ func TestRegisterSpanProcessor(t *testing.T) {
}
}
}

onEndingOK := false
for _, kv := range sp.spansEnded[0].Attributes() {
switch kv.Key {
case "OnEnding":
onEndingOK = true
default:
continue
}
}

if c != len(spNames) {
t.Errorf("%s: expected attributes(SpanProcessorName): got %d, want %d\n", name, c, len(spNames))
}
Expand All @@ -139,6 +157,9 @@ func TestRegisterSpanProcessor(t *testing.T) {
if !sidOK {
t.Errorf("%s: expected attributes(ParentSpanID)\n", name)
}
if !onEndingOK {
t.Errorf("%s: expected attributes(OnEnding)\n", name)
}
}
}

Expand Down