Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 24 additions & 5 deletions src/instana/tracer.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
Tracer,
TracerProvider,
_Links,
get_current_span as otel_get_current_span,
use_span,
)
from opentelemetry.util import types
Expand All @@ -27,7 +28,8 @@
from instana.propagators.text_propagator import TextPropagator
from instana.recorder import StanRecorder
from instana.sampling import InstanaSampler, Sampler
from instana.span.span import InstanaSpan, get_current_span
from instana.span.span import InstanaSpan
from instana.span.span import get_current_span as instana_get_current_span
from instana.span_context import SpanContext
from instana.util.ids import generate_id

Expand Down Expand Up @@ -108,16 +110,24 @@ def exporter(self) -> Optional[Type["BaseAgent"]]:
def start_span(
self,
name: str,
span_context: Optional[SpanContext] = None,
context: Optional[Context] = None,
kind: SpanKind = SpanKind.INTERNAL,
attributes: types.Attributes = None,
links: _Links = None,
start_time: Optional[int] = None,
record_exception: bool = True,
set_status_on_exception: bool = True,
span_context: Optional[SpanContext] = None,
) -> InstanaSpan:
# Extract span_context from context if needed (OpenTelemetry API compliance)
if context is not None and span_context is None:
otel_ctx = otel_get_current_span(context).get_span_context()
if isinstance(otel_ctx, SpanContext):
span_context = otel_ctx


parent_context = (
span_context if span_context else get_current_span().get_span_context()
span_context if span_context else instana_get_current_span().get_span_context()
)

if parent_context and not isinstance(parent_context, SpanContext):
Expand All @@ -140,24 +150,33 @@ def start_span(
def start_as_current_span(
self,
name: str,
span_context: Optional[SpanContext] = None,
context: Optional[Context] = None,
kind: SpanKind = SpanKind.INTERNAL,
attributes: types.Attributes = None,
links: _Links = None,
start_time: Optional[int] = None,
record_exception: bool = True,
set_status_on_exception: bool = True,
end_on_exit: bool = True,
span_context: Optional[SpanContext] = None,
) -> Iterator[InstanaSpan]:
# Extract span_context from context if needed (OpenTelemetry API compliance)
if context is not None and span_context is None:
otel_ctx = otel_get_current_span(context).get_span_context()
if isinstance(otel_ctx, SpanContext):
span_context = otel_ctx

# Pass both context and span_context - the guard in start_span prevents redundant extraction
span = self.start_span(
name=name,
span_context=span_context,
context=context,
kind=kind,
attributes=attributes,
links=links,
start_time=start_time,
record_exception=record_exception,
set_status_on_exception=set_status_on_exception,
span_context=span_context,
)
with use_span(
span,
Expand Down
Loading
Loading