From 860114d45afde785842cace2dd07db2d12b79729 Mon Sep 17 00:00:00 2001 From: Alex Normand Date: Thu, 18 Aug 2022 15:09:07 -0700 Subject: [PATCH 1/2] Use span read lock when reading span meta from span context --- ddtrace/tracer/spancontext.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ddtrace/tracer/spancontext.go b/ddtrace/tracer/spancontext.go index 99c8d7dc4d..386f8ce76b 100644 --- a/ddtrace/tracer/spancontext.go +++ b/ddtrace/tracer/spancontext.go @@ -127,8 +127,8 @@ func (c *spanContext) baggageItem(key string) string { } func (c *spanContext) meta(key string) (val string, ok bool) { - c.mu.RLock() - defer c.mu.RUnlock() + c.span.RLock() + defer c.span.RLock() val, ok = c.span.Meta[key] return val, ok } From b7744f5169df8ba247e82cca9b4558cb5d992b8c Mon Sep 17 00:00:00 2001 From: Alex Normand Date: Mon, 22 Aug 2022 14:19:27 -0700 Subject: [PATCH 2/2] Fix typo un mutex unlock call --- ddtrace/tracer/spancontext.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ddtrace/tracer/spancontext.go b/ddtrace/tracer/spancontext.go index 386f8ce76b..5db2795f8b 100644 --- a/ddtrace/tracer/spancontext.go +++ b/ddtrace/tracer/spancontext.go @@ -128,7 +128,7 @@ func (c *spanContext) baggageItem(key string) string { func (c *spanContext) meta(key string) (val string, ok bool) { c.span.RLock() - defer c.span.RLock() + defer c.span.RUnlock() val, ok = c.span.Meta[key] return val, ok }