Skip to content

Fix parent_id was missed when logging under leaf span #1695

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Nov 16, 2022
Merged

Fix parent_id was missed when logging under leaf span #1695

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b39bc6f
Fix parent_id was missed when logging under leaf span
kalemas Nov 15, 2022
b48396b
Merge branch 'main' into fix-logging-for-leaf-span
basepi Nov 16, 2022
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
4 changes: 3 additions & 1 deletion elasticapm/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
from elasticapm.conf import Config, VersionedConfig, constants
from elasticapm.conf.constants import ERROR
from elasticapm.metrics.base_metrics import MetricsRegistry
from elasticapm.traces import Tracer, execution_context
from elasticapm.traces import DroppedSpan, Tracer, execution_context
from elasticapm.utils import cgroup, cloud, compat, is_master_process, stacks, varmap
from elasticapm.utils.disttracing import TraceParent
from elasticapm.utils.encoding import enforce_label_format, keyword_field, shorten, transform
Expand Down Expand Up @@ -469,6 +469,8 @@ def _build_msg_for_logging(
"""
transaction = execution_context.get_transaction()
span = execution_context.get_span()
while isinstance(span, DroppedSpan):
span = span.parent
if transaction:
transaction_context = deepcopy(transaction.context)
else:
Expand Down