Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improve trace_context performance #4721

Merged
merged 9 commits into from
Nov 29, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
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]

### Changed

- Improve `go.opentelemetry.io/otel/propagation.TraceContext` 's performance (#4721)

### Removed

- Remove the deprecated `go.opentelemetry.io/otel/bridge/opencensus.NewTracer`. (#4706)
Expand Down
102 changes: 58 additions & 44 deletions propagation/trace_context.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"context"
"encoding/hex"
"fmt"
"regexp"
"strings"

"go.opentelemetry.io/otel/trace"
)
Expand All @@ -28,6 +28,7 @@
maxVersion = 254
traceparentHeader = "traceparent"
tracestateHeader = "tracestate"
parentDelimiter = "-"
xiehuc marked this conversation as resolved.
Show resolved Hide resolved
)

// TraceContext is a propagator that supports the W3C Trace Context format
Expand All @@ -41,8 +42,8 @@
type TraceContext struct{}

var (
_ TextMapPropagator = TraceContext{}
traceCtxRegExp = regexp.MustCompile("^(?P<version>[0-9a-f]{2})-(?P<traceID>[a-f0-9]{32})-(?P<spanID>[a-f0-9]{16})-(?P<traceFlags>[a-f0-9]{2})(?:-.*)?$")
_ TextMapPropagator = TraceContext{}
versionPart = fmt.Sprintf("%.2X", supportedVersion)
)

// Inject set tracecontext from the Context into the carrier.
Expand All @@ -59,12 +60,27 @@
// Clear all flags other than the trace-context supported sampling bit.
flags := sc.TraceFlags() & trace.FlagsSampled

h := fmt.Sprintf("%.2x-%s-%s-%s",
supportedVersion,
sc.TraceID(),
sc.SpanID(),
flags)
carrier.Set(traceparentHeader, h)
var sb strings.Builder
sb.Grow(2 + 32 + 16 + 2 + 3)
_, _ = sb.WriteString(versionPart)
traceID := sc.TraceID()
spanID := sc.SpanID()
flagByte := [1]byte{byte(flags)}
writeTraceParent(&sb, traceID[:], spanID[:], flagByte[:])
carrier.Set(traceparentHeader, sb.String())
}

func writeTraceParent(sb *strings.Builder, srcs ...[]byte) {
for _, src := range srcs {
_, _ = sb.WriteByte(parentDelimiter[0])

Check failure on line 75 in propagation/trace_context.go

View workflow job for this annotation

GitHub Actions / lint

assignment mismatch: 2 variables but sb.WriteByte returns 1 value (typecheck)

Check failure on line 75 in propagation/trace_context.go

View workflow job for this annotation

GitHub Actions / lint

assignment mismatch: 2 variables but sb.WriteByte returns 1 value) (typecheck)

Check failure on line 75 in propagation/trace_context.go

View workflow job for this annotation

GitHub Actions / lint

assignment mismatch: 2 variables but sb.WriteByte returns 1 value) (typecheck)

Check failure on line 75 in propagation/trace_context.go

View workflow job for this annotation

GitHub Actions / lint

assignment mismatch: 2 variables but sb.WriteByte returns 1 value) (typecheck)

Check failure on line 75 in propagation/trace_context.go

View workflow job for this annotation

GitHub Actions / lint

assignment mismatch: 2 variables but sb.WriteByte returns 1 value) (typecheck)

Check failure on line 75 in propagation/trace_context.go

View workflow job for this annotation

GitHub Actions / test-coverage

assignment mismatch: 2 variables but sb.WriteByte returns 1 value

Check failure on line 75 in propagation/trace_context.go

View workflow job for this annotation

GitHub Actions / test-bench

assignment mismatch: 2 variables but sb.WriteByte returns 1 value

Check failure on line 75 in propagation/trace_context.go

View workflow job for this annotation

GitHub Actions / compatibility-test (~1.21.3, ubuntu-latest, 386)

assignment mismatch: 2 variables but sb.WriteByte returns 1 value

Check failure on line 75 in propagation/trace_context.go

View workflow job for this annotation

GitHub Actions / compatibility-test (~1.21.3, ubuntu-latest, amd64)

assignment mismatch: 2 variables but sb.WriteByte returns 1 value

Check failure on line 75 in propagation/trace_context.go

View workflow job for this annotation

GitHub Actions / test-race

assignment mismatch: 2 variables but sb.WriteByte returns 1 value

Check failure on line 75 in propagation/trace_context.go

View workflow job for this annotation

GitHub Actions / compatibility-test (~1.20.10, ubuntu-latest, amd64)

assignment mismatch: 2 variables but sb.WriteByte returns 1 value
pellared marked this conversation as resolved.
Show resolved Hide resolved
writeHex(sb, src)
}
}

func writeHex(sb *strings.Builder, src []byte) {
var dst [32]byte
xiehuc marked this conversation as resolved.
Show resolved Hide resolved
n := hex.Encode(dst[:], src)
_, _ = sb.Write(dst[:n])
}

// Extract reads tracecontext from the carrier into a returned Context.
Expand All @@ -86,58 +102,33 @@
return trace.SpanContext{}
}

matches := traceCtxRegExp.FindStringSubmatch(h)

if len(matches) == 0 {
return trace.SpanContext{}
}

if len(matches) < 5 { // four subgroups plus the overall match
return trace.SpanContext{}
}

if len(matches[1]) != 2 {
return trace.SpanContext{}
}
ver, err := hex.DecodeString(matches[1])
if err != nil {
var ver [1]byte
if !extractPart(ver[:], &h, 2) {
return trace.SpanContext{}
}
version := int(ver[0])
if version > maxVersion {
return trace.SpanContext{}
}

if version == 0 && len(matches) != 5 { // four subgroups plus the overall match
return trace.SpanContext{}
}

if len(matches[2]) != 32 {
return trace.SpanContext{}
}

var scc trace.SpanContextConfig

scc.TraceID, err = trace.TraceIDFromHex(matches[2][:32])
if err != nil {
return trace.SpanContext{}
}

if len(matches[3]) != 16 {
if !extractPart(scc.TraceID[:], &h, 32) {
return trace.SpanContext{}
}
scc.SpanID, err = trace.SpanIDFromHex(matches[3])
if err != nil {
if !extractPart(scc.SpanID[:], &h, 16) {
return trace.SpanContext{}
}

if len(matches[4]) != 2 {
var opts [1]byte
if !extractPart(opts[:], &h, 2) {
return trace.SpanContext{}
}
opts, err := hex.DecodeString(matches[4])
if err != nil || len(opts) < 1 || (version == 0 && opts[0] > 2) {
if version == 0 && (h != "" || opts[0] > 2) {
// version 0 not allow extra
// version 0 not allow other flag
return trace.SpanContext{}
}

// Clear all flags other than the trace-context supported sampling bit.
scc.TraceFlags = trace.TraceFlags(opts[0]) & trace.FlagsSampled

Expand All @@ -155,6 +146,29 @@
return sc
}

// upperHex detect hex is upper case.
xiehuc marked this conversation as resolved.
Show resolved Hide resolved
func upperHex(v string) bool {
for _, c := range v {
if c >= 'A' && c <= 'F' {
return true
}
}
return false
}

func extractPart(dst []byte, h *string, n int) bool {
part, left, _ := strings.Cut(*h, parentDelimiter)
xiehuc marked this conversation as resolved.
Show resolved Hide resolved
*h = left
// hex.Decode support Upper hex, but we doesn't want it, so need exclude
xiehuc marked this conversation as resolved.
Show resolved Hide resolved
if len(part) != n || upperHex(part) {
return false
}
if p, err := hex.Decode(dst, []byte(part)); err != nil || p != n/2 {
return false
}
return true
}

// Fields returns the keys who's values are set with Inject.
func (tc TraceContext) Fields() []string {
return []string{traceparentHeader, tracestateHeader}
Expand Down