Make GetSpan return a statically allocated invalid span

michaelvanstraten · michaelvanstraten · commit 61bea775fe4a · 2024-10-07T16:47:14.000+02:00
diff --git a/api/include/opentelemetry/trace/context.h b/api/include/opentelemetry/trace/context.h
@@ -20,7 +20,10 @@ inline nostd::shared_ptr<Span> GetSpan(const context::Context &context) noexcept
   {
     return nostd::get<nostd::shared_ptr<Span>>(span);
   }
-  return nostd::shared_ptr<Span>(new DefaultSpan(SpanContext::GetInvalid()));
+
+  static thread_local nostd::shared_ptr<Span> invalid_span =
+      nostd::shared_ptr<Span>(new DefaultSpan(SpanContext::GetInvalid()));
+  return invalid_span;
 }
 
 inline bool IsRootSpan(const context::Context &context) noexcept

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,10 @@ inline nostd::shared_ptr<Span> GetSpan(const context::Context &context) noexcept`
`20`	`20`	`{`
`21`	`21`	`return nostd::get<nostd::shared_ptr<Span>>(span);`
`22`	`22`	`}`
`23`		`- return nostd::shared_ptr<Span>(new DefaultSpan(SpanContext::GetInvalid()));`
	`23`	`+`
	`24`	`+ static thread_local nostd::shared_ptr<Span> invalid_span =`
	`25`	`+ nostd::shared_ptr<Span>(new DefaultSpan(SpanContext::GetInvalid()));`
	`26`	`+ return invalid_span;`
`24`	`27`	`}`
`25`	`28`
`26`	`29`	`inline bool IsRootSpan(const context::Context &context) noexcept`