@@ -17,6 +17,7 @@ import (
1717
1818 "go.opentelemetry.io/otel/attribute"
1919 "go.opentelemetry.io/otel/codes"
20+ "go.opentelemetry.io/otel/internal/epoch"
2021 "go.opentelemetry.io/otel/internal/global"
2122 "go.opentelemetry.io/otel/sdk/instrumentation"
2223 "go.opentelemetry.io/otel/sdk/resource"
@@ -114,11 +115,11 @@ type recordingSpan struct {
114115 name string
115116
116117 // startTime is the time at which this span was started.
117- startTime time. Time
118+ startTime epoch. Nanos
118119
119- // endTime is the time at which this span was ended. It contains the zero
120- // value of time.Time until the span is ended.
121- endTime time. Time
120+ // endTime is the time at which this span was ended. It contains zero until
121+ // the span is ended.
122+ endTime epoch. Nanos
122123
123124 // status is the status of this span.
124125 status Status
@@ -168,40 +169,19 @@ func (s *recordingSpan) SpanContext() trace.SpanContext {
168169// IsRecording returns if this span is being recorded. If this span has ended
169170// this will return false.
170171func (s * recordingSpan ) IsRecording () bool {
171- if s == nil {
172- return false
173- }
174- s .mu .Lock ()
175- defer s .mu .Unlock ()
176-
177- return s .isRecording ()
178- }
179-
180- // isRecording returns if this span is being recorded. If this span has ended
181- // this will return false.
182- //
183- // This method assumes s.mu.Lock is held by the caller.
184- func (s * recordingSpan ) isRecording () bool {
185- if s == nil {
186- return false
187- }
188- return s .endTime .IsZero ()
172+ return s != nil && (& s .endTime ).Load () == 0
189173}
190174
191175// SetStatus sets the status of the Span in the form of a code and a
192176// description, overriding previous values set. The description is only
193177// included in the set status when the code is for an error. If this span is
194178// not being recorded than this method does nothing.
195179func (s * recordingSpan ) SetStatus (code codes.Code , description string ) {
196- if s == nil {
180+ if ! s . IsRecording () {
197181 return
198182 }
199-
200183 s .mu .Lock ()
201184 defer s .mu .Unlock ()
202- if ! s .isRecording () {
203- return
204- }
205185 if s .status .Code > code {
206186 return
207187 }
@@ -225,15 +205,12 @@ func (s *recordingSpan) SetStatus(code codes.Code, description string) {
225205// attributes the span is configured to have, the last added attributes will
226206// be dropped.
227207func (s * recordingSpan ) SetAttributes (attributes ... attribute.KeyValue ) {
228- if s == nil || len (attributes ) == 0 {
208+ if ! s . IsRecording () || len (attributes ) == 0 {
229209 return
230210 }
231211
232212 s .mu .Lock ()
233213 defer s .mu .Unlock ()
234- if ! s .isRecording () {
235- return
236- }
237214
238215 limit := s .tracer .provider .spanLimits .AttributeCountLimit
239216 if limit == 0 {
@@ -444,24 +421,17 @@ func truncate(limit int, s string) string {
444421// If this method is called while panicking an error event is added to the
445422// Span before ending it and the panic is continued.
446423func (s * recordingSpan ) End (options ... trace.SpanEndOption ) {
447- // Do not start by checking if the span is being recorded which requires
448- // acquiring a lock. Make a minimal check that the span is not nil.
449424 if s == nil {
450425 return
451426 }
452427
453- // Store the end time as soon as possible to avoid artificially increasing
454- // the span's duration in case some operation below takes a while.
455- et := monotonicEndTime (s .startTime )
456-
457- // Lock the span now that we have an end time and see if we need to do any more processing.
458- s .mu .Lock ()
459- if ! s .isRecording () {
460- s .mu .Unlock ()
428+ config := trace .NewSpanEndConfig (options ... )
429+ endTime := epoch .NanosNowOrDefault (config .Timestamp ())
430+ // Only the first call to End sets the time using atomic compare-and-swap.
431+ if ! (& s .endTime ).SwapIfZero (endTime ) {
461432 return
462433 }
463434
464- config := trace .NewSpanEndConfig (options ... )
465435 if recovered := recover (); recovered != nil {
466436 // Record but don't stop the panic.
467437 defer panic (recovered )
@@ -482,19 +452,9 @@ func (s *recordingSpan) End(options ...trace.SpanEndOption) {
482452 }
483453
484454 if s .executionTracerTaskEnd != nil {
485- s .mu .Unlock ()
486455 s .executionTracerTaskEnd ()
487- s .mu .Lock ()
488456 }
489457
490- // Setting endTime to non-zero marks the span as ended and not recording.
491- if config .Timestamp ().IsZero () {
492- s .endTime = et
493- } else {
494- s .endTime = config .Timestamp ()
495- }
496- s .mu .Unlock ()
497-
498458 sps := s .tracer .provider .getSpanProcessors ()
499459 if len (sps ) == 0 {
500460 return
@@ -505,30 +465,17 @@ func (s *recordingSpan) End(options ...trace.SpanEndOption) {
505465 }
506466}
507467
508- // monotonicEndTime returns the end time at present but offset from start,
509- // monotonically.
510- //
511- // The monotonic clock is used in subtractions hence the duration since start
512- // added back to start gives end as a monotonic time. See
513- // https://golang.org/pkg/time/#hdr-Monotonic_Clocks
514- func monotonicEndTime (start time.Time ) time.Time {
515- return start .Add (time .Since (start ))
516- }
517-
518468// RecordError will record err as a span event for this span. An additional call to
519469// SetStatus is required if the Status of the Span should be set to Error, this method
520470// does not change the Span status. If this span is not being recorded or err is nil
521471// than this method does nothing.
522472func (s * recordingSpan ) RecordError (err error , opts ... trace.EventOption ) {
523- if s == nil || err == nil {
473+ if err == nil || ! s . IsRecording () {
524474 return
525475 }
526476
527477 s .mu .Lock ()
528478 defer s .mu .Unlock ()
529- if ! s .isRecording () {
530- return
531- }
532479
533480 opts = append (opts , trace .WithAttributes (
534481 semconv .ExceptionType (typeStr (err )),
@@ -564,15 +511,12 @@ func recordStackTrace() string {
564511// AddEvent adds an event with the provided name and options. If this span is
565512// not being recorded then this method does nothing.
566513func (s * recordingSpan ) AddEvent (name string , o ... trace.EventOption ) {
567- if s == nil {
514+ if ! s . IsRecording () {
568515 return
569516 }
570517
571518 s .mu .Lock ()
572519 defer s .mu .Unlock ()
573- if ! s .isRecording () {
574- return
575- }
576520 s .addEvent (name , o ... )
577521}
578522
@@ -601,15 +545,12 @@ func (s *recordingSpan) addEvent(name string, o ...trace.EventOption) {
601545// SetName sets the name of this span. If this span is not being recorded than
602546// this method does nothing.
603547func (s * recordingSpan ) SetName (name string ) {
604- if s == nil {
548+ if ! s . IsRecording () {
605549 return
606550 }
607551
608552 s .mu .Lock ()
609553 defer s .mu .Unlock ()
610- if ! s .isRecording () {
611- return
612- }
613554 s .name = name
614555}
615556
@@ -638,15 +579,13 @@ func (s *recordingSpan) SpanKind() trace.SpanKind {
638579func (s * recordingSpan ) StartTime () time.Time {
639580 s .mu .Lock ()
640581 defer s .mu .Unlock ()
641- return s .startTime
582+ return s .startTime . ToTime ()
642583}
643584
644585// EndTime returns the time this span ended. For spans that have not yet
645586// ended, the returned value will be the zero value of time.Time.
646587func (s * recordingSpan ) EndTime () time.Time {
647- s .mu .Lock ()
648- defer s .mu .Unlock ()
649- return s .endTime
588+ return (& s .endTime ).Load ().ToTime ()
650589}
651590
652591// Attributes returns the attributes of this span.
@@ -740,7 +679,7 @@ func (s *recordingSpan) Resource() *resource.Resource {
740679}
741680
742681func (s * recordingSpan ) AddLink (link trace.Link ) {
743- if s == nil {
682+ if ! s . IsRecording () {
744683 return
745684 }
746685 if ! link .SpanContext .IsValid () && len (link .Attributes ) == 0 &&
@@ -750,9 +689,6 @@ func (s *recordingSpan) AddLink(link trace.Link) {
750689
751690 s .mu .Lock ()
752691 defer s .mu .Unlock ()
753- if ! s .isRecording () {
754- return
755- }
756692
757693 l := Link {SpanContext : link .SpanContext , Attributes : link .Attributes }
758694
@@ -814,14 +750,14 @@ func (s *recordingSpan) snapshot() ReadOnlySpan {
814750 s .mu .Lock ()
815751 defer s .mu .Unlock ()
816752
817- sd .endTime = s .endTime
753+ sd .endTime = s .endTime . ToTime ()
818754 sd .instrumentationScope = s .tracer .instrumentationScope
819755 sd .name = s .name
820756 sd .parent = s .parent
821757 sd .resource = s .tracer .provider .resource
822758 sd .spanContext = s .spanContext
823759 sd .spanKind = s .spanKind
824- sd .startTime = s .startTime
760+ sd .startTime = s .startTime . ToTime ()
825761 sd .status = s .status
826762 sd .childSpanCount = s .childSpanCount
827763
@@ -842,15 +778,12 @@ func (s *recordingSpan) snapshot() ReadOnlySpan {
842778}
843779
844780func (s * recordingSpan ) addChild () {
845- if s == nil {
781+ if ! s . IsRecording () {
846782 return
847783 }
848784
849785 s .mu .Lock ()
850786 defer s .mu .Unlock ()
851- if ! s .isRecording () {
852- return
853- }
854787 s .childSpanCount ++
855788}
856789
0 commit comments