Repository navigation
fix(sdk): catch and log unhandled exceptions in MultiSpanProcessor #5626
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
Open
somuai
wants to merge
3
commits into
open-telemetry:main
Choose a base branch
from
somuai:fix-span-processor-exception-guard
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| `opentelemetry-sdk`: catch and log unhandled exceptions in MultiSpanProcessor |
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 |
|---|---|---|
|
|
@@ -177,21 +177,33 @@ def on_start( | |
| parent_context: context_api.Context | None = None, | ||
| ) -> None: | ||
| for sp in self._span_processors: | ||
| sp.on_start(span, parent_context=parent_context) | ||
| try: | ||
| sp.on_start(span, parent_context=parent_context) | ||
| except Exception: # pylint: disable=broad-exception-caught | ||
| logger.exception("Exception while calling SpanProcessor.on_start.") | ||
|
|
||
| def _on_ending(self, span: "Span") -> None: | ||
| for sp in self._span_processors: | ||
| # pylint: disable=protected-access | ||
| sp._on_ending(span) | ||
| try: | ||
| sp._on_ending(span) | ||
| except Exception: # pylint: disable=broad-exception-caught | ||
| logger.exception("Exception while calling SpanProcessor._on_ending.") | ||
|
|
||
| def on_end(self, span: "ReadableSpan") -> None: | ||
| for sp in self._span_processors: | ||
| sp.on_end(span) | ||
| try: | ||
| sp.on_end(span) | ||
| except Exception: # pylint: disable=broad-exception-caught | ||
| logger.exception("Exception while calling SpanProcessor.on_end.") | ||
|
|
||
| def shutdown(self) -> None: | ||
| """Sequentially shuts down all underlying span processors.""" | ||
| for sp in self._span_processors: | ||
| sp.shutdown() | ||
| try: | ||
| sp.shutdown() | ||
| except Exception: # pylint: disable=broad-exception-caught | ||
| logger.exception("Exception while calling SpanProcessor.shutdown.") | ||
|
|
||
| def force_flush(self, timeout_millis: int = 30000) -> bool: | ||
| """Sequentially calls force_flush on all underlying | ||
|
|
@@ -214,7 +226,11 @@ def force_flush(self, timeout_millis: int = 30000) -> bool: | |
| if current_time_ns >= deadline_ns: | ||
| return False | ||
|
|
||
| if sp.force_flush((deadline_ns - current_time_ns) // 1000000) is False: | ||
| try: | ||
| if sp.force_flush((deadline_ns - current_time_ns) // 1000000) is False: | ||
| all_flushed = False | ||
| except Exception: # pylint: disable=broad-exception-caught | ||
| logger.exception("Exception while calling SpanProcessor.force_flush.") | ||
| all_flushed = False | ||
|
|
||
| return all_flushed | ||
|
|
@@ -269,10 +285,16 @@ def _submit_and_await( | |
| ): | ||
| futures = [] | ||
| for sp in self._span_processors: | ||
| future = self._executor.submit(func(sp), *args, **kwargs) | ||
| futures.append(future) | ||
| try: | ||
| future = self._executor.submit(func(sp), *args, **kwargs) | ||
| futures.append(future) | ||
| except Exception: # pylint: disable=broad-exception-caught | ||
| logger.exception("Exception while submitting task to SpanProcessor executor.") | ||
| for future in futures: | ||
| future.result() | ||
| try: | ||
| future.result() | ||
| except Exception: # pylint: disable=broad-exception-caught | ||
| logger.exception("Exception while executing SpanProcessor task.") | ||
|
|
||
| def on_start( | ||
| self, | ||
|
|
@@ -303,21 +325,30 @@ def force_flush(self, timeout_millis: int = 30000) -> bool: | |
| True if all span processors flushed their spans within the given | ||
| timeout, False otherwise. | ||
| """ | ||
| all_flushed = True | ||
| futures = [] | ||
| for sp in self._span_processors: | ||
| future = self._executor.submit(sp.force_flush, timeout_millis) | ||
| futures.append(future) | ||
| try: | ||
| future = self._executor.submit(sp.force_flush, timeout_millis) | ||
| futures.append(future) | ||
| except Exception: # pylint: disable=broad-exception-caught | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The exception potentially raised from the span processor won't be raised here, it'll be raised on the result below. Likewise the call to |
||
| logger.exception("Exception while submitting task to SpanProcessor executor.") | ||
| all_flushed = False | ||
|
|
||
| timeout_sec = timeout_millis / 1e3 | ||
| done_futures, not_done_futures = concurrent.futures.wait(futures, timeout_sec) | ||
| if not_done_futures: | ||
| return False | ||
|
|
||
| for future in done_futures: | ||
|
|
||
| if future.result() is False: | ||
| return False | ||
| try: | ||
| if future.result() is False: | ||
| all_flushed = False | ||
| except Exception: # pylint: disable=broad-exception-caught | ||
| logger.exception("Exception while executing SpanProcessor force_flush.") | ||
| all_flushed = False | ||
|
|
||
| return True | ||
| return all_flushed | ||
|
|
||
|
|
||
| class EventBase(abc.ABC): | ||
|
|
||
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same issue here.