go/opentelemetry-go
1
0
Fork 0
mirror of https://github.com/open-telemetry/opentelemetry-go.git synced 2025-11-27 22:49:15 +02:00
Code Issues Releases Activity

Rename TraceFlagsSampled, TraceFlagsUnused

Browse Source
This commit is contained in:
tensorchen
2020-05-06 01:41:54 +08:00
parent 40e8769e83
commit 2ffbd869d7
11 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
api/trace/b3_propagator.go
View File

@@ -56,7 +56,7 @@ func (b3 B3) Inject(ctx context.Context, supplier propagation.HTTPSupplier) {
return return
} }
if b3.SingleHeader { if b3.SingleHeader {
sampled := sc.TraceFlags & TraceFlagsSampled sampled := sc.TraceFlags & FlagsSampled
supplier.Set(B3SingleHeader, supplier.Set(B3SingleHeader,
fmt.Sprintf("%s-%s-%.1d", sc.TraceID, sc.SpanID, sampled)) fmt.Sprintf("%s-%s-%.1d", sc.TraceID, sc.SpanID, sampled))
} else { } else {
@@ -105,8 +105,8 @@ func (b3 B3) extract(supplier propagation.HTTPSupplier) SpanContext {
if !ok { if !ok {
return EmptySpanContext() return EmptySpanContext()
} }
if debug == TraceFlagsSampled { if debug == FlagsSampled {
sampled = TraceFlagsSampled sampled = FlagsSampled
} }
sc := SpanContext{ sc := SpanContext{
@@ -176,14 +176,14 @@ func (b3 B3) extractSampledState(sampled string) (flag byte, ok bool) {
case "", "0": case "", "0":
return 0, true return 0, true
case "1": case "1":
return TraceFlagsSampled, true return FlagsSampled, true
case "true": case "true":
if !b3.SingleHeader { if !b3.SingleHeader {
return TraceFlagsSampled, true return FlagsSampled, true
} }
case "d": case "d":
if b3.SingleHeader { if b3.SingleHeader {
return TraceFlagsSampled, true return FlagsSampled, true
} }
} }
return 0, false return 0, false
@@ -195,7 +195,7 @@ func (b3 B3) extracDebugFlag(debug string) (flag byte, ok bool) {
case "", "0": case "", "0":
return 0, true return 0, true
case "1": case "1":
return TraceFlagsSampled, true return FlagsSampled, true
} }
return 0, false return 0, false
} }

6
api/trace/span_context.go
View File

@@ -24,10 +24,10 @@ const (
traceFlagsBitMaskSampled = byte(0x01) traceFlagsBitMaskSampled = byte(0x01)
traceFlagsBitMaskUnused = byte(0xFE) traceFlagsBitMaskUnused = byte(0xFE)
// TraceFlagsSampled is a byte with sampled bit set. It is a convenient value initializer // FlagsSampled is a byte with sampled bit set. It is a convenient value initializer
// for SpanContext TraceFlags field when a trace is sampled. // for SpanContext TraceFlags field when a trace is sampled.
TraceFlagsSampled = traceFlagsBitMaskSampled FlagsSampled = traceFlagsBitMaskSampled
TraceFlagsUnused = traceFlagsBitMaskUnused FlagsUnused = traceFlagsBitMaskUnused
ErrInvalidHexID errorConst = "trace-id and span-id can only contain [0-9a-f] characters, all lowercase" ErrInvalidHexID errorConst = "trace-id and span-id can only contain [0-9a-f] characters, all lowercase"

4
api/trace/span_context_test.go
View File

@@ -169,14 +169,14 @@ func TestSpanContextIsSampled(t *testing.T) {
name: "sampled", name: "sampled",
sc: trace.SpanContext{ sc: trace.SpanContext{
TraceID: trace.ID([16]byte{1}), TraceID: trace.ID([16]byte{1}),
TraceFlags: trace.TraceFlagsSampled, TraceFlags: trace.FlagsSampled,
}, },
want: true, want: true,
}, { }, {
name: "sampled plus unused", name: "sampled plus unused",
sc: trace.SpanContext{ sc: trace.SpanContext{
TraceID: trace.ID([16]byte{1}), TraceID: trace.ID([16]byte{1}),
TraceFlags: trace.TraceFlagsSampled | trace.TraceFlagsUnused, TraceFlags: trace.FlagsSampled | trace.FlagsUnused,
}, },
want: true, want: true,
}, { }, {

20
api/trace/testtrace/b3_propagator_data_test.go
View File

@@ -58,7 +58,7 @@ var extractMultipleHeaders = []extractTest{
wantSc: trace.SpanContext{ wantSc: trace.SpanContext{
TraceID: traceID, TraceID: traceID,
SpanID: spanID, SpanID: spanID,
TraceFlags: trace.TraceFlagsSampled, TraceFlags: trace.FlagsSampled,
}, },
}, },
{ {
@@ -71,7 +71,7 @@ var extractMultipleHeaders = []extractTest{
wantSc: trace.SpanContext{ wantSc: trace.SpanContext{
TraceID: traceID, TraceID: traceID,
SpanID: spanID, SpanID: spanID,
TraceFlags: trace.TraceFlagsSampled, TraceFlags: trace.FlagsSampled,
}, },
}, },
{ {
@@ -84,7 +84,7 @@ var extractMultipleHeaders = []extractTest{
wantSc: trace.SpanContext{ wantSc: trace.SpanContext{
TraceID: traceID, TraceID: traceID,
SpanID: spanID, SpanID: spanID,
TraceFlags: trace.TraceFlagsSampled, TraceFlags: trace.FlagsSampled,
}, },
}, },
{ {
@@ -101,7 +101,7 @@ var extractMultipleHeaders = []extractTest{
wantSc: trace.SpanContext{ wantSc: trace.SpanContext{
TraceID: traceID, TraceID: traceID,
SpanID: spanID, SpanID: spanID,
TraceFlags: trace.TraceFlagsSampled, TraceFlags: trace.FlagsSampled,
}, },
}, },
{ {
@@ -115,7 +115,7 @@ var extractMultipleHeaders = []extractTest{
wantSc: trace.SpanContext{ wantSc: trace.SpanContext{
TraceID: traceID, TraceID: traceID,
SpanID: spanID, SpanID: spanID,
TraceFlags: trace.TraceFlagsSampled, TraceFlags: trace.FlagsSampled,
}, },
}, },
{ {
@@ -156,7 +156,7 @@ var extractSingleHeader = []extractTest{
wantSc: trace.SpanContext{ wantSc: trace.SpanContext{
TraceID: traceID, TraceID: traceID,
SpanID: spanID, SpanID: spanID,
TraceFlags: trace.TraceFlagsSampled, TraceFlags: trace.FlagsSampled,
}, },
}, },
{ {
@@ -167,7 +167,7 @@ var extractSingleHeader = []extractTest{
wantSc: trace.SpanContext{ wantSc: trace.SpanContext{
TraceID: traceID, TraceID: traceID,
SpanID: spanID, SpanID: spanID,
TraceFlags: trace.TraceFlagsSampled, TraceFlags: trace.FlagsSampled,
}, },
}, },
{ {
@@ -178,7 +178,7 @@ var extractSingleHeader = []extractTest{
wantSc: trace.SpanContext{ wantSc: trace.SpanContext{
TraceID: traceID, TraceID: traceID,
SpanID: spanID, SpanID: spanID,
TraceFlags: trace.TraceFlagsSampled, TraceFlags: trace.FlagsSampled,
}, },
}, },
{ {
@@ -446,7 +446,7 @@ var injectB3MultipleHeader = []injectTest{
parentSc: trace.SpanContext{ parentSc: trace.SpanContext{
TraceID: traceID, TraceID: traceID,
SpanID: spanID, SpanID: spanID,
TraceFlags: trace.TraceFlagsSampled, TraceFlags: trace.FlagsSampled,
}, },
wantHeaders: map[string]string{ wantHeaders: map[string]string{
trace.B3TraceIDHeader: "4bf92f3577b34da6a3ce929d0e0e4736", trace.B3TraceIDHeader: "4bf92f3577b34da6a3ce929d0e0e4736",
@@ -496,7 +496,7 @@ var injectB3SingleleHeader = []injectTest{
parentSc: trace.SpanContext{ parentSc: trace.SpanContext{
TraceID: traceID, TraceID: traceID,
SpanID: spanID, SpanID: spanID,
TraceFlags: trace.TraceFlagsSampled, TraceFlags: trace.FlagsSampled,
}, },
wantHeaders: map[string]string{ wantHeaders: map[string]string{
trace.B3SingleHeader: "4bf92f3577b34da6a3ce929d0e0e4736-0000000000000001-1", trace.B3SingleHeader: "4bf92f3577b34da6a3ce929d0e0e4736-0000000000000001-1",

2
api/trace/testtrace/trace_context_propagator_benchmark_test.go
View File

@@ -49,7 +49,7 @@ func injectSubBenchmarks(b *testing.B, fn func(context.Context, *testing.B)) {
sc := trace.SpanContext{ sc := trace.SpanContext{
TraceID: traceID, TraceID: traceID,
SpanID: spanID, SpanID: spanID,
TraceFlags: trace.TraceFlagsSampled, TraceFlags: trace.FlagsSampled,
} }
ctx := trace.ContextWithRemoteSpanContext(context.Background(), sc) ctx := trace.ContextWithRemoteSpanContext(context.Background(), sc)
ctx, _ = mockTracer.Start(ctx, "inject") ctx, _ = mockTracer.Start(ctx, "inject")

14
api/trace/testtrace/trace_context_propagator_test.go
View File

@@ -62,7 +62,7 @@ func TestExtractValidTraceContextFromHTTPReq(t *testing.T) {
wantSc: trace.SpanContext{ wantSc: trace.SpanContext{
TraceID: traceID, TraceID: traceID,
SpanID: spanID, SpanID: spanID,
TraceFlags: trace.TraceFlagsSampled, TraceFlags: trace.FlagsSampled,
}, },
}, },
{ {
@@ -71,7 +71,7 @@ func TestExtractValidTraceContextFromHTTPReq(t *testing.T) {
wantSc: trace.SpanContext{ wantSc: trace.SpanContext{
TraceID: traceID, TraceID: traceID,
SpanID: spanID, SpanID: spanID,
TraceFlags: trace.TraceFlagsSampled, TraceFlags: trace.FlagsSampled,
}, },
}, },
{ {
@@ -80,7 +80,7 @@ func TestExtractValidTraceContextFromHTTPReq(t *testing.T) {
wantSc: trace.SpanContext{ wantSc: trace.SpanContext{
TraceID: traceID, TraceID: traceID,
SpanID: spanID, SpanID: spanID,
TraceFlags: trace.TraceFlagsSampled, TraceFlags: trace.FlagsSampled,
}, },
}, },
{ {
@@ -97,7 +97,7 @@ func TestExtractValidTraceContextFromHTTPReq(t *testing.T) {
wantSc: trace.SpanContext{ wantSc: trace.SpanContext{
TraceID: traceID, TraceID: traceID,
SpanID: spanID, SpanID: spanID,
TraceFlags: trace.TraceFlagsSampled, TraceFlags: trace.FlagsSampled,
}, },
}, },
{ {
@@ -106,7 +106,7 @@ func TestExtractValidTraceContextFromHTTPReq(t *testing.T) {
wantSc: trace.SpanContext{ wantSc: trace.SpanContext{
TraceID: traceID, TraceID: traceID,
SpanID: spanID, SpanID: spanID,
TraceFlags: trace.TraceFlagsSampled, TraceFlags: trace.FlagsSampled,
}, },
}, },
{ {
@@ -115,7 +115,7 @@ func TestExtractValidTraceContextFromHTTPReq(t *testing.T) {
wantSc: trace.SpanContext{ wantSc: trace.SpanContext{
TraceID: traceID, TraceID: traceID,
SpanID: spanID, SpanID: spanID,
TraceFlags: trace.TraceFlagsSampled, TraceFlags: trace.FlagsSampled,
}, },
}, },
} }
@@ -240,7 +240,7 @@ func TestInjectTraceContextToHTTPReq(t *testing.T) {
sc: trace.SpanContext{ sc: trace.SpanContext{
TraceID: traceID, TraceID: traceID,
SpanID: spanID, SpanID: spanID,
TraceFlags: trace.TraceFlagsSampled, TraceFlags: trace.FlagsSampled,
}, },
wantHeader: "00-4bf92f3577b34da6a3ce929d0e0e4736-0000000000000001-01", wantHeader: "00-4bf92f3577b34da6a3ce929d0e0e4736-0000000000000001-01",
}, },

4
api/trace/trace_context_propagator.go
View File

@@ -62,7 +62,7 @@ func (TraceContext) Inject(ctx context.Context, supplier propagation.HTTPSupplie
supportedVersion, supportedVersion,
sc.TraceID, sc.TraceID,
sc.SpanID, sc.SpanID,
sc.TraceFlags&TraceFlagsSampled) sc.TraceFlags&FlagsSampled)
supplier.Set(traceparentHeader, h) supplier.Set(traceparentHeader, h)
} }
@@ -137,7 +137,7 @@ func (TraceContext) extract(supplier propagation.HTTPSupplier) SpanContext {
if err != nil || len(opts) < 1 || (version == 0 && opts[0] > 2) { if err != nil || len(opts) < 1 || (version == 0 && opts[0] > 2) {
return EmptySpanContext() return EmptySpanContext()
} }
sc.TraceFlags = opts[0] &^ TraceFlagsUnused sc.TraceFlags = opts[0] &^ FlagsUnused
if !sc.IsValid() { if !sc.IsValid() {
return EmptySpanContext() return EmptySpanContext()

2
internal/trace/mock_tracer.go
View File

@@ -69,7 +69,7 @@ func (mt *MockTracer) Start(ctx context.Context, name string, o ...apitrace.Star
sc = apitrace.SpanContext{} sc = apitrace.SpanContext{}
_, _ = rand.Read(sc.TraceID[:]) _, _ = rand.Read(sc.TraceID[:])
if mt.Sampled { if mt.Sampled {
sc.TraceFlags = apitrace.TraceFlagsSampled sc.TraceFlags = apitrace.FlagsSampled
} }
} else { } else {
sc = parentSpanContext sc = parentSpanContext

2
sdk/trace/sampling_test.go
View File

@@ -29,7 +29,7 @@ func TestAlwaysParentSampleWithParentSampled(t *testing.T) {
parentCtx := trace.SpanContext{ parentCtx := trace.SpanContext{
TraceID: traceID, TraceID: traceID,
SpanID: spanID, SpanID: spanID,
TraceFlags: trace.TraceFlagsSampled, TraceFlags: trace.FlagsSampled,
} }
if sampler.ShouldSample(sdktrace.SamplingParameters{ParentContext: parentCtx}).Decision != sdktrace.RecordAndSampled { if sampler.ShouldSample(sdktrace.SamplingParameters{ParentContext: parentCtx}).Decision != sdktrace.RecordAndSampled {
t.Error("Sampling decision should be RecordAndSampled") t.Error("Sampling decision should be RecordAndSampled")

6
sdk/trace/span.go
View File

@@ -403,13 +403,13 @@ func makeSamplingDecision(data samplingData) SamplingResult {
Links: data.links, Links: data.links,
}) })
if sampled.Decision == RecordAndSampled { if sampled.Decision == RecordAndSampled {
spanContext.TraceFlags |= apitrace.TraceFlagsSampled spanContext.TraceFlags |= apitrace.FlagsSampled
} else { } else {
spanContext.TraceFlags &^= apitrace.TraceFlagsSampled spanContext.TraceFlags &^= apitrace.FlagsSampled
} }
return sampled return sampled
} }
if data.parent.TraceFlags&apitrace.TraceFlagsSampled != 0 { if data.parent.TraceFlags&apitrace.FlagsSampled != 0 {
return SamplingResult{Decision: RecordAndSampled} return SamplingResult{Decision: RecordAndSampled}
} }
return SamplingResult{Decision: NotRecord} return SamplingResult{Decision: NotRecord}

2
sdk/trace/trace_test.go
View File

@@ -200,7 +200,7 @@ func TestSampling(t *testing.T) {
SpanID: idg.NewSpanID(), SpanID: idg.NewSpanID(),
} }
if tc.sampledParent { if tc.sampledParent {
psc.TraceFlags = apitrace.TraceFlagsSampled psc.TraceFlags = apitrace.FlagsSampled
} }
ctx = apitrace.ContextWithRemoteSpanContext(ctx, psc) ctx = apitrace.ContextWithRemoteSpanContext(ctx, psc)
} }