go/opentelemetry-go
1
0
Fork 0
mirror of https://github.com/open-telemetry/opentelemetry-go.git synced 2025-11-29 23:07:45 +02:00
Code Issues Releases Activity

Move SpanContext from core package into trace

Browse Source
This commit is contained in:
tensorchen
2020-05-02 20:17:11 +08:00
parent 34bd998963
commit c6c155de6f
47 changed files with 392 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sdk/trace/span.go
View File

@@ -45,7 +45,7 @@ type span struct {
// SpanContext, so that the trace ID is propagated.
data *export.SpanData
mu sync.Mutex // protects the contents of *data (but not the pointer value.)
spanContext core.SpanContext
spanContext apitrace.SpanContext
// attributes are capped at configured limit. When the capacity is reached an oldest entry
// is removed to create room for a new entry.
@@ -67,9 +67,9 @@ type span struct {
var _ apitrace.Span = &span{}
func (s *span) SpanContext() core.SpanContext {
func (s *span) SpanContext() apitrace.SpanContext {
if s == nil {
return core.EmptySpanContext()
return apitrace.EmptySpanContext()
}
return s.spanContext
}
@@ -212,9 +212,9 @@ func (s *span) SetName(name string) {
s.data.Name = name
// SAMPLING
noParent := !s.data.ParentSpanID.IsValid()
var ctx core.SpanContext
var ctx apitrace.SpanContext
if noParent {
ctx = core.EmptySpanContext()
ctx = apitrace.EmptySpanContext()
} else {
// FIXME: Where do we get the parent context from?
// From SpanStore?
@@ -303,14 +303,14 @@ func (s *span) addChild() {
s.mu.Unlock()
}
func startSpanInternal(tr *tracer, name string, parent core.SpanContext, remoteParent bool, o apitrace.StartConfig) *span {
func startSpanInternal(tr *tracer, name string, parent apitrace.SpanContext, remoteParent bool, o apitrace.StartConfig) *span {
var noParent bool
span := &span{}
span.spanContext = parent
cfg := tr.provider.config.Load().(*Config)
if parent == core.EmptySpanContext() {
if parent == apitrace.EmptySpanContext() {
span.spanContext.TraceID = cfg.IDGenerator.NewTraceID()
noParent = true
}
@@ -370,7 +370,7 @@ func startSpanInternal(tr *tracer, name string, parent core.SpanContext, remoteP
type samplingData struct {
noParent bool
remoteParent bool
parent core.SpanContext
parent apitrace.SpanContext
name string
cfg *Config
span *span
@@ -403,13 +403,13 @@ func makeSamplingDecision(data samplingData) SamplingResult {
Links: data.links,
})
if sampled.Decision == RecordAndSampled {
spanContext.TraceFlags |= core.TraceFlagsSampled
spanContext.TraceFlags |= apitrace.TraceFlagsSampled
} else {
spanContext.TraceFlags &^= core.TraceFlagsSampled
spanContext.TraceFlags &^= apitrace.TraceFlagsSampled
}
return sampled
}
if data.parent.TraceFlags&core.TraceFlagsSampled != 0 {
if data.parent.TraceFlags&apitrace.TraceFlagsSampled != 0 {
return SamplingResult{Decision: RecordAndSampled}
}
return SamplingResult{Decision: NotRecord}