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

Make span.finish work #3559

Merged
merged 1 commit into from
Sep 24, 2024
Merged
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
15 changes: 11 additions & 4 deletions sentry_sdk/tracing.py
Original file line number Diff line number Diff line change
Expand Up @@ -1268,7 +1268,7 @@ def __enter__(self):

def __exit__(self, ty, value, tb):
# type: (Optional[Any], Optional[Any], Optional[Any]) -> None
self._otel_span.end()
self.finish()
# XXX set status to error if unset and an exception occurred?
context.detach(self._ctx_token)

Expand Down Expand Up @@ -1524,9 +1524,16 @@ def is_success(self):
# type: () -> bool
return self._otel_span.status.code == StatusCode.OK

def finish(self, scope=None, end_timestamp=None):
# type: (Optional[sentry_sdk.Scope], Optional[Union[float, datetime]]) -> Optional[str]
pass
def finish(self, end_timestamp=None):
# type: (Optional[Union[float, datetime]]) -> Optional[str]
if end_timestamp is not None:
from sentry_sdk.integrations.opentelemetry.utils import (
convert_to_otel_timestamp,
)

self._otel_span.end(convert_to_otel_timestamp(end_timestamp))
else:
self._otel_span.end()

def to_json(self):
# type: () -> dict[str, Any]
Expand Down
Loading