Skip to content

fix(aws-lambda): Remove messaging.batch.message_count from the Lambda span #8229

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

Draft
sentry-junior wants to merge 4 commits into
base: major/3.0
Choose a base branch
from
+9 −16
Draft

fix(aws-lambda): Remove messaging.batch.message_count from the Lambda span #8229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
46ed68d
fix(aws-lambda): Only set messaging.batch.message_count for SQS and S…
sentry-junior[bot] Nov 9, 2026
9337a81
fix(aws-lambda): Remove messaging.batch.message_count from the Lambda…
sentry-junior[bot] Nov 9, 2026
1c10668
ci: Trigger CI (the previous push started no workflows)
sentry-junior[bot] Nov 9, 2026
c42e110
test(aws-lambda): Drop the unused batch_size column in test_non_dict_…
sentry-junior[bot] Nov 9, 2026
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
3 changes: 0 additions & 3 deletions sentry_sdk/integrations/aws_lambda/_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,8 @@ def sentry_handler(

if isinstance(aws_event, list) and len(aws_event) >= 1:
request_data = aws_event[0]
batch_size = len(aws_event)
else:
request_data = aws_event
batch_size = 1

if not isinstance(request_data, dict):
# If we're not dealing with a dictionary, we won't be able to get
Expand Down Expand Up @@ -160,7 +158,6 @@ def sentry_handler(
SPANDATA.SENTRY_SEGMENT_NAME_SOURCE: SegmentNameSource.COMPONENT,
SPANDATA.CLOUD_PROVIDER: CLOUD_PROVIDER,
SPANDATA.CLOUD_PLATFORM: CLOUD_PLATFORM,
SPANDATA.MESSAGING_BATCH_MESSAGE_COUNT: batch_size,
**header_attributes,
**additional_attributes,
}
Expand Down
22 changes: 9 additions & 13 deletions tests/integrations/aws_lambda/test_aws_lambda.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,12 +159,12 @@ def test_timeout_error_scope_modified(lambda_client, test_environment):


@pytest.mark.parametrize(
"aws_event, has_request_data, batch_size",
"aws_event, has_request_data",
[
(b"1231", False, 1),
(b"11.21", False, 1),
(b'"Good dog!"', False, 1),
(b"true", False, 1),
(b"1231", False),
(b"11.21", False),
(b'"Good dog!"', False),
(b"true", False),
(
b"""
[
Expand All @@ -175,7 +175,6 @@ def test_timeout_error_scope_modified(lambda_client, test_environment):
]
""",
False,
4,
),
(
b"""
Expand Down Expand Up @@ -207,9 +206,8 @@ def test_timeout_error_scope_modified(lambda_client, test_environment):
]
""",
True,
2,
),
(b"[]", False, 1),
(b"[]", False),
],
ids=[
"event as integer",
Expand All @@ -221,9 +219,7 @@ def test_timeout_error_scope_modified(lambda_client, test_environment):
"event as empty list",
],
)
def test_non_dict_event(
lambda_client, test_environment, aws_event, has_request_data, batch_size
):
def test_non_dict_event(lambda_client, test_environment, aws_event, has_request_data):
lambda_client.invoke(
FunctionName="BasicException",
Payload=aws_event,
Expand Down Expand Up @@ -756,7 +752,7 @@ def test_no_error(lambda_client, test_environment):
assert _get_span_attr(attrs, SPANDATA.AWS_LOG_STREAM_NAMES) == [
LATEST_FUNCTION_VERSION
]
assert _get_span_attr(attrs, SPANDATA.MESSAGING_BATCH_MESSAGE_COUNT) == 1
assert SPANDATA.MESSAGING_BATCH_MESSAGE_COUNT not in attrs


def test_error(lambda_client, test_environment):
Expand Down Expand Up @@ -810,7 +806,7 @@ def test_error(lambda_client, test_environment):
assert _get_span_attr(attrs, SPANDATA.AWS_LOG_STREAM_NAMES) == [
LATEST_FUNCTION_VERSION
]
assert _get_span_attr(attrs, SPANDATA.MESSAGING_BATCH_MESSAGE_COUNT) == 1
assert SPANDATA.MESSAGING_BATCH_MESSAGE_COUNT not in attrs


def test_trace_continuation(lambda_client, test_environment):
Expand Down
Loading