Skip to content
Draft
Show file tree
Hide file tree
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
3 changes: 1 addition & 2 deletions sentry_sdk/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
from sentry_sdk.transport import BaseHttpTransport, make_transport
from sentry_sdk.consts import (
SPANDATA,
DEFAULT_MAX_VALUE_LENGTH,
DEFAULT_OPTIONS,
INSTRUMENTER,
VERSION,
Expand Down Expand Up @@ -566,7 +565,7 @@ def _prepare_event(
"include_local_variables", True
),
max_value_length=self.options.get(
"max_value_length", DEFAULT_MAX_VALUE_LENGTH
"max_value_length", None
),
),
"crashed": False,
Expand Down
8 changes: 1 addition & 7 deletions sentry_sdk/consts.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@
from enum import Enum
from typing import TYPE_CHECKING

# up top to prevent circular import due to integration import
# This is more or less an arbitrary large-ish value for now, so that we allow
# pretty long strings (like LLM prompts), but still have *some* upper limit
# until we verify that removing the trimming completely is safe.
DEFAULT_MAX_VALUE_LENGTH = 100_000

DEFAULT_MAX_STACK_FRAMES = 100
DEFAULT_ADD_FULL_STACK = False

Expand Down Expand Up @@ -989,7 +983,7 @@ def __init__(
], # type: Optional[Sequence[str]]
functions_to_trace=[], # type: Sequence[Dict[str, str]] # noqa: B006
event_scrubber=None, # type: Optional[sentry_sdk.scrubber.EventScrubber]
max_value_length=DEFAULT_MAX_VALUE_LENGTH, # type: int
max_value_length=None, # type: Optional[int]
enable_backpressure_handling=True, # type: bool
error_sampler=None, # type: Optional[Callable[[Event, Hint], Union[float, bool]]]
enable_db_query_source=True, # type: bool
Expand Down
5 changes: 2 additions & 3 deletions sentry_sdk/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
from sentry_sdk.consts import (
DEFAULT_ADD_FULL_STACK,
DEFAULT_MAX_STACK_FRAMES,
DEFAULT_MAX_VALUE_LENGTH,
EndpointType,
)
from sentry_sdk._types import Annotated, AnnotatedValue, SENSITIVE_DATA_SUBSTITUTE
Expand Down Expand Up @@ -730,7 +729,7 @@ def single_exception_from_error_tuple(
if client_options is None:
include_local_variables = True
include_source_context = True
max_value_length = DEFAULT_MAX_VALUE_LENGTH # fallback
max_value_length = None # fallback
custom_repr = None
else:
include_local_variables = client_options["include_local_variables"]
Expand Down Expand Up @@ -1211,7 +1210,7 @@ def strip_string(value, max_length=None):
return value

if max_length is None:
max_length = DEFAULT_MAX_VALUE_LENGTH
return value

byte_size = _get_size_in_bytes(value)
text_size = len(value)
Expand Down
91 changes: 57 additions & 34 deletions tests/integrations/bottle/test_bottle.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
from io import BytesIO
from bottle import Bottle, debug as set_debug, abort, redirect, HTTPResponse
from sentry_sdk import capture_message
from sentry_sdk.consts import DEFAULT_MAX_VALUE_LENGTH
from sentry_sdk.integrations.bottle import BottleIntegration
from sentry_sdk.serializer import MAX_DATABAG_BREADTH

Expand Down Expand Up @@ -121,10 +120,17 @@ def index():
assert event["exception"]["values"][0]["mechanism"]["handled"] is False


def test_large_json_request(sentry_init, capture_events, app, get_client):
sentry_init(integrations=[BottleIntegration()], max_request_body_size="always")
@pytest.mark.parametrize("max_value_length", [1024, None])
def test_large_json_request(
sentry_init, capture_events, app, get_client, max_value_length
):
sentry_init(
integrations=[BottleIntegration()],
max_request_body_size="always",
max_value_length=max_value_length,
)

data = {"foo": {"bar": "a" * (DEFAULT_MAX_VALUE_LENGTH + 10)}}
data = {"foo": {"bar": "a" * (1034)}}

@app.route("/", method="POST")
def index():
Expand All @@ -144,15 +150,17 @@ def index():
assert response[1] == "200 OK"

(event,) = events
assert event["_meta"]["request"]["data"]["foo"]["bar"] == {
"": {
"len": DEFAULT_MAX_VALUE_LENGTH + 10,
"rem": [
["!limit", "x", DEFAULT_MAX_VALUE_LENGTH - 3, DEFAULT_MAX_VALUE_LENGTH]
],

if max_value_length:
assert event["_meta"]["request"]["data"]["foo"]["bar"] == {
"": {
"len": 1034,
"rem": [["!limit", "x", 1021, 1024]],
}
}
}
assert len(event["request"]["data"]["foo"]["bar"]) == DEFAULT_MAX_VALUE_LENGTH
assert len(event["request"]["data"]["foo"]["bar"]) == 1024
else:
assert len(event["request"]["data"]["foo"]["bar"]) == 1034


@pytest.mark.parametrize("data", [{}, []], ids=["empty-dict", "empty-list"])
Expand All @@ -179,10 +187,17 @@ def index():
assert event["request"]["data"] == data


def test_medium_formdata_request(sentry_init, capture_events, app, get_client):
sentry_init(integrations=[BottleIntegration()], max_request_body_size="always")
@pytest.mark.parametrize("max_value_length", [1024, None])
def test_medium_formdata_request(
sentry_init, capture_events, app, get_client, max_value_length
):
sentry_init(
integrations=[BottleIntegration()],
max_request_body_size="always",
max_value_length=max_value_length,
)

data = {"foo": "a" * (DEFAULT_MAX_VALUE_LENGTH + 10)}
data = {"foo": "a" * (1034)}

@app.route("/", method="POST")
def index():
Expand All @@ -199,15 +214,17 @@ def index():
assert response[1] == "200 OK"

(event,) = events
assert event["_meta"]["request"]["data"]["foo"] == {
"": {
"len": DEFAULT_MAX_VALUE_LENGTH + 10,
"rem": [
["!limit", "x", DEFAULT_MAX_VALUE_LENGTH - 3, DEFAULT_MAX_VALUE_LENGTH]
],

if max_value_length:
assert event["_meta"]["request"]["data"]["foo"] == {
"": {
"len": 1034,
"rem": [["!limit", "x", 1021, 1024]],
}
}
}
assert len(event["request"]["data"]["foo"]) == DEFAULT_MAX_VALUE_LENGTH
assert len(event["request"]["data"]["foo"]) == 1024
else:
assert len(event["request"]["data"]["foo"]) == 1034


@pytest.mark.parametrize("input_char", ["a", b"a"])
Expand Down Expand Up @@ -241,11 +258,16 @@ def index():
assert not event["request"]["data"]


def test_files_and_form(sentry_init, capture_events, app, get_client):
sentry_init(integrations=[BottleIntegration()], max_request_body_size="always")
@pytest.mark.parametrize("max_value_length", [1024, None])
def test_files_and_form(sentry_init, capture_events, app, get_client, max_value_length):
sentry_init(
integrations=[BottleIntegration()],
max_request_body_size="always",
max_value_length=max_value_length,
)

data = {
"foo": "a" * (DEFAULT_MAX_VALUE_LENGTH + 10),
"foo": "a" * (1034),
"file": (BytesIO(b"hello"), "hello.txt"),
}

Expand All @@ -266,15 +288,16 @@ def index():
assert response[1] == "200 OK"

(event,) = events
assert event["_meta"]["request"]["data"]["foo"] == {
"": {
"len": DEFAULT_MAX_VALUE_LENGTH + 10,
"rem": [
["!limit", "x", DEFAULT_MAX_VALUE_LENGTH - 3, DEFAULT_MAX_VALUE_LENGTH]
],
if max_value_length:
assert event["_meta"]["request"]["data"]["foo"] == {
"": {
"len": 1034,
"rem": [["!limit", "x", 1021, 1024]],
}
}
}
assert len(event["request"]["data"]["foo"]) == DEFAULT_MAX_VALUE_LENGTH
assert len(event["request"]["data"]["foo"]) == 1024
else:
assert len(event["request"]["data"]["foo"]) == 1034

assert event["_meta"]["request"]["data"]["file"] == {
"": {
Expand Down
29 changes: 17 additions & 12 deletions tests/integrations/falcon/test_falcon.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import falcon
import falcon.testing
import sentry_sdk
from sentry_sdk.consts import DEFAULT_MAX_VALUE_LENGTH
from sentry_sdk.integrations.falcon import FalconIntegration
from sentry_sdk.integrations.logging import LoggingIntegration
from sentry_sdk.utils import parse_version
Expand Down Expand Up @@ -207,10 +206,15 @@ def on_get(self, req, resp):
assert len(events) == 0


def test_falcon_large_json_request(sentry_init, capture_events):
sentry_init(integrations=[FalconIntegration()], max_request_body_size="always")
@pytest.mark.parametrize("max_value_length", [1024, None])
def test_falcon_large_json_request(sentry_init, capture_events, max_value_length):
sentry_init(
integrations=[FalconIntegration()],
max_request_body_size="always",
max_value_length=max_value_length,
)

data = {"foo": {"bar": "a" * (DEFAULT_MAX_VALUE_LENGTH + 10)}}
data = {"foo": {"bar": "a" * (1034)}}

class Resource:
def on_post(self, req, resp):
Expand All @@ -228,15 +232,16 @@ def on_post(self, req, resp):
assert response.status == falcon.HTTP_200

(event,) = events
assert event["_meta"]["request"]["data"]["foo"]["bar"] == {
"": {
"len": DEFAULT_MAX_VALUE_LENGTH + 10,
"rem": [
["!limit", "x", DEFAULT_MAX_VALUE_LENGTH - 3, DEFAULT_MAX_VALUE_LENGTH]
],
if max_value_length:
assert event["_meta"]["request"]["data"]["foo"]["bar"] == {
"": {
"len": 1034,
"rem": [["!limit", "x", 1021, 1024]],
}
}
}
assert len(event["request"]["data"]["foo"]["bar"]) == DEFAULT_MAX_VALUE_LENGTH
assert len(event["request"]["data"]["foo"]["bar"]) == 1024
else:
assert len(event["request"]["data"]["foo"]["bar"]) == 1034


@pytest.mark.parametrize("data", [{}, []], ids=["empty-dict", "empty-list"])
Expand Down
Loading
Loading