Uh oh!
There was an error while loading. Please reload this page.
[do not merge] feat: Span streaming & new span API#5317
Uh oh!
There was an error while loading. Please reload this page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,23 @@ | ||
| import json | ||
| import threading | ||
| from collections import defaultdict | ||
| from datetime import datetime, timezone | ||
| from typing import TYPE_CHECKING | ||
| from sentry_sdk._batcher import Batcher | ||
| from sentry_sdk.envelope import Envelope, Item, PayloadRef | ||
| from sentry_sdk.utils import format_timestamp, serialize_attribute | ||
| if TYPE_CHECKING: | ||
| from typing import Any, Callable, Optional | ||
| from sentry_sdk.traces import StreamedSpan | ||
| class SpanBatcher(Batcher["StreamedSpan"]): | ||
| # TODO[span-first]: adjust flush/drop defaults | ||
| MAX_BEFORE_FLUSH = 1000 | ||
| MAX_BEFORE_DROP = 1000 | ||
| MAX_BYTES_BEFORE_FLUSH = 5 * 1024 * 1024 # 5 MB | ||
| FLUSH_WAIT_TIME = 5.0 | ||
| TYPE = "span" | ||
| @@ -35,6 +34,7 @@ | ||
| # envelope. | ||
| # trace_id -> span buffer | ||
| self._span_buffer: dict[str, list["StreamedSpan"]] = defaultdict(list) | ||
| self._running_size: dict[str, int] = defaultdict(lambda: 0) | ||
| self._capture_func = capture_func | ||
| self._record_lost_func = record_lost_func | ||
| self._running = True | ||
| @@ -64,18 +64,39 @@ | ||
| return None | ||
| self._span_buffer[span.trace_id].append(span) | ||
| if size + 1 >= self.MAX_BEFORE_FLUSH: | ||
| self._flush_event.set() | ||
| return | ||
| self._running_size[span.trace_id] += self._estimate_size(span) | ||
| if self._running_size[span.trace_id] >= self.MAX_BYTES_BEFORE_FLUSH: | ||
| self._flush_event.set() | ||
| return | ||
| @staticmethod | ||
| def _estimate_size(item: "StreamedSpan") -> int: | ||
| # This is just a quick approximation | ||
| span_dict = SpanBatcher._to_transport_format(item) | ||
| return len(str(span_dict)) | ||
Check warning on line 81 in sentry_sdk/_span_batcher.py
| ||
sentrivana marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| @staticmethod | ||
| def _to_transport_format(item: "StreamedSpan") -> "Any": | ||
| res: "dict[str, Any]" = { | ||
| "trace_id": item.trace_id, | ||
| "span_id": item.span_id, | ||
| "name": item._name, | ||
| "status": item._status, | ||
| "is_segment": item.is_segment(), | ||
| "start_timestamp": item.start_timestamp.timestamp(), | ||
| } | ||
| if item.timestamp: | ||
| res["end_timestamp"] = item.timestamp.timestamp() | ||
| if item.parent_span_id: | ||
| res["parent_span_id"] = item.parent_span_id | ||
| if item._attributes: | ||
| res["attributes"] = { | ||
| k: serialize_attribute(v) for (k, v) in item._attributes.items() | ||
| @@ -89,11 +110,9 @@ | ||
| return None | ||
| envelopes = [] | ||
| for spans in self._span_buffer.values(): | ||
| if spans: | ||
| dsc = spans[0].dynamic_sampling_context() | ||
| envelope = Envelope( | ||
| headers={ | ||
| @@ -123,6 +142,7 @@ | ||
| envelopes.append(envelope) | ||
| self._span_buffer.clear() | ||
| self._running_size.clear() | ||
| for envelope in envelopes: | ||
| self._capture_func(envelope) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.