Remove deprecated code#2666

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
sentrivana merged 6 commits into from
Jan 29, 2024
Merged

Remove deprecated code #2666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ddc5c33
Remove deprecated client options
sentrivana Jan 22, 2024
68f920d
Merge branch 'sentry-sdk-2.0' into ivana/2.0/remove-deprecated-code
sentrivana Jan 23, 2024
144aa17
Remove .install()
sentrivana Jan 23, 2024
772ad20
Remove new_span
sentrivana Jan 23, 2024
d2d0bf3
another new_span
sentrivana Jan 23, 2024
a32bfa8
Merge branch 'sentry-sdk-2.0' into ivana/2.0/remove-deprecated-code
sentrivana Jan 29, 2024
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
5 changes: 5 additions & 0 deletions MIGRATION_GUIDE.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,11 @@
- Removed support for Flask 0.\*.
- `sentry_sdk._functools` was removed.
- A number of compatibility utilities were removed from `sentry_sdk._compat`: the constants `PY2` and `PY33`; the functions `datetime_utcnow`, `utc_from_timestamp`, `implements_str`, `contextmanager`; and the aliases `text_type`, `string_types`, `number_types`, `int_types`, `iteritems`, `binary_sequence_types`.
- The deprecated `with_locals` configuration option was removed. Use `include_local_variables` instead. See https://docs.sentry.io/platforms/python/configuration/options/#include-local-variables.
- The deprecated `request_bodies` configuration option was removed. Use `max_request_body_size`. See https://docs.sentry.io/platforms/python/configuration/options/#max-request-body-size.
- Removed `tracing_utils_py2.py`. The `start_child_span_decorator` is now in `sentry_sdk.tracing_utils`.
- Removed support for the `install` method for custom integrations. Please use `setup_once` instead.
- Removed `sentry_sdk.tracing.Span.new_span`. Use `sentry_sdk.tracing.Span.start_child` instead.
- Removed `sentry_sdk.tracing.Transaction.new_span`. Use `sentry_sdk.tracing.Transaction.start_child` instead.

## Deprecated
20 changes: 0 additions & 20 deletions sentry_sdk/client.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,26 +80,6 @@ def _get_options(*args, **kwargs):

for key, value in options.items():
if key not in rv:
# Option "with_locals" was renamed to "include_local_variables"
if key == "with_locals":
msg = (
"Deprecated: The option 'with_locals' was renamed to 'include_local_variables'. "
"Please use 'include_local_variables'. The option 'with_locals' will be removed in the future."
)
logger.warning(msg)
rv["include_local_variables"] = value
continue

# Option "request_bodies" was renamed to "max_request_body_size"
if key == "request_bodies":
msg = (
"Deprecated: The option 'request_bodies' was renamed to 'max_request_body_size'. "
"Please use 'max_request_body_size'. The option 'request_bodies' will be removed in the future."
)
logger.warning(msg)
rv["max_request_body_size"] = value
continue

raise TypeError("Unknown option %r" % (key,))

rv[key] = value
Expand Down
10 changes: 0 additions & 10 deletions sentry_sdk/integrations/__init__.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -143,16 +143,6 @@ def setup_integrations(
)
try:
type(integration).setup_once()
except NotImplementedError:
if getattr(integration, "install", None) is not None:
logger.warning(
"Integration %s: The install method is "
"deprecated. Use `setup_once`.",
identifier,
)
integration.install() # type: ignore
else:
raise
except DidNotEnable as e:
if identifier not in used_as_default_integration:
raise
Expand Down
12 changes: 0 additions & 12 deletions sentry_sdk/tracing.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -263,14 +263,6 @@ def start_child(self, instrumenter=INSTRUMENTER.SENTRY, **kwargs):

return child

def new_span(self, **kwargs):
# type: (**Any) -> Span
"""DEPRECATED: use :py:meth:`sentry_sdk.tracing.Span.start_child` instead."""
logger.warning(
"Deprecated: use Span.start_child instead of Span.new_span. This will be removed in the future."
)
return self.start_child(**kwargs)

@classmethod
def continue_from_environ(
cls,
Expand DownExpand Up@@ -917,10 +909,6 @@ def start_child(self, instrumenter=INSTRUMENTER.SENTRY, **kwargs):
# type: (str, **Any) -> NoOpSpan
return NoOpSpan()

def new_span(self, **kwargs):
# type: (**Any) -> NoOpSpan
return self.start_child(**kwargs)

def to_traceparent(self):
# type: () -> str
return ""
Expand Down
55 changes: 0 additions & 55 deletions tests/test_client.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@
)
from sentry_sdk.integrations.executing import ExecutingIntegration
from sentry_sdk.transport import Transport
from sentry_sdk.utils import logger
from sentry_sdk.serializer import MAX_DATABAG_BREADTH
from sentry_sdk.consts import DEFAULT_MAX_BREADCRUMBS, DEFAULT_MAX_VALUE_LENGTH
from sentry_sdk._types import TYPE_CHECKING
Expand DownExpand Up@@ -367,60 +366,6 @@ def e(exc):
assert mock_capture_internal_exception.call_args[0][0][0] == EventCapturedError


def test_with_locals_deprecation_enabled(sentry_init):
with mock.patch.object(logger, "warning", mock.Mock()) as fake_warning:
sentry_init(with_locals=True)

client = Hub.current.client
assert "with_locals" not in client.options
assert "include_local_variables" in client.options
assert client.options["include_local_variables"]

fake_warning.assert_called_once_with(
"Deprecated: The option 'with_locals' was renamed to 'include_local_variables'. Please use 'include_local_variables'. The option 'with_locals' will be removed in the future."
)


def test_with_locals_deprecation_disabled(sentry_init):
with mock.patch.object(logger, "warning", mock.Mock()) as fake_warning:
sentry_init(with_locals=False)

client = Hub.current.client
assert "with_locals" not in client.options
assert "include_local_variables" in client.options
assert not client.options["include_local_variables"]

fake_warning.assert_called_once_with(
"Deprecated: The option 'with_locals' was renamed to 'include_local_variables'. Please use 'include_local_variables'. The option 'with_locals' will be removed in the future."
)


def test_include_local_variables_deprecation(sentry_init):
with mock.patch.object(logger, "warning", mock.Mock()) as fake_warning:
sentry_init(include_local_variables=False)

client = Hub.current.client
assert "with_locals" not in client.options
assert "include_local_variables" in client.options
assert not client.options["include_local_variables"]

fake_warning.assert_not_called()


def test_request_bodies_deprecation(sentry_init):
with mock.patch.object(logger, "warning", mock.Mock()) as fake_warning:
sentry_init(request_bodies="small")

client = Hub.current.client
assert "request_bodies" not in client.options
assert "max_request_body_size" in client.options
assert client.options["max_request_body_size"] == "small"

fake_warning.assert_called_once_with(
"Deprecated: The option 'request_bodies' was renamed to 'max_request_body_size'. Please use 'max_request_body_size'. The option 'request_bodies' will be removed in the future."
)


def test_include_local_variables_enabled(sentry_init, capture_events):
sentry_init(include_local_variables=True)
events = capture_events()
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Remove deprecated code#2666

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

sentrivana
merged 6 commits into

from

Jan 29, 2024
 Merged


Remove deprecated code
#2666
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
ddc5c33

Remove deprecated client options


sentrivana Jan 22, 2024
68f920d

Merge branch 'sentry-sdk-2.0' into ivana/2.0/remove-deprecated-code


sentrivana Jan 23, 2024
144aa17

Remove .install()


sentrivana Jan 23, 2024
772ad20

Remove new_span


sentrivana Jan 23, 2024
d2d0bf3

another new_span


sentrivana Jan 23, 2024
a32bfa8

Merge branch 'sentry-sdk-2.0' into ivana/2.0/remove-deprecated-code


sentrivana Jan 29, 2024

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


5 changes: 5 additions & 0 deletions
MIGRATION_GUIDE.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,11 @@
- Removed support for Flask 0.\*.
- `sentry_sdk._functools` was removed.
- A number of compatibility utilities were removed from `sentry_sdk._compat`: the constants `PY2` and `PY33`; the functions `datetime_utcnow`, `utc_from_timestamp`, `implements_str`, `contextmanager`; and the aliases `text_type`, `string_types`, `number_types`, `int_types`, `iteritems`, `binary_sequence_types`.
- The deprecated `with_locals` configuration option was removed. Use `include_local_variables` instead. See https://docs.sentry.io/platforms/python/configuration/options/#include-local-variables.
- The deprecated `request_bodies` configuration option was removed. Use `max_request_body_size`. See https://docs.sentry.io/platforms/python/configuration/options/#max-request-body-size.
- Removed `tracing_utils_py2.py`. The `start_child_span_decorator` is now in `sentry_sdk.tracing_utils`.
- Removed support for the `install` method for custom integrations. Please use `setup_once` instead.
- Removed `sentry_sdk.tracing.Span.new_span`. Use `sentry_sdk.tracing.Span.start_child` instead.
- Removed `sentry_sdk.tracing.Transaction.new_span`. Use `sentry_sdk.tracing.Transaction.start_child` instead.

## Deprecated

20 changes: 0 additions & 20 deletions
sentry_sdk/client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,26 +80,6 @@ def _get_options(*args, **kwargs):

 for key, value in options.items():
 if key not in rv:
 # Option "with_locals" was renamed to "include_local_variables"
 if key == "with_locals":
 msg = (
 "Deprecated: The option 'with_locals' was renamed to 'include_local_variables'. "
 "Please use 'include_local_variables'. The option 'with_locals' will be removed in the future."
 )
 logger.warning(msg)
 rv["include_local_variables"] = value
 continue

 # Option "request_bodies" was renamed to "max_request_body_size"
 if key == "request_bodies":
 msg = (
 "Deprecated: The option 'request_bodies' was renamed to 'max_request_body_size'. "
 "Please use 'max_request_body_size'. The option 'request_bodies' will be removed in the future."
 )
 logger.warning(msg)
 rv["max_request_body_size"] = value
 continue

 raise TypeError("Unknown option %r" % (key,))

 rv[key] = value
Expand Down

10 changes: 0 additions & 10 deletions
sentry_sdk/integrations/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -143,16 +143,6 @@ def setup_integrations(
 )
 try:
 type(integration).setup_once()
 except NotImplementedError:
 if getattr(integration, "install", None) is not None:
 logger.warning(
 "Integration %s: The install method is "
 "deprecated. Use `setup_once`.",
 identifier,
 )
 integration.install() # type: ignore
 else:
 raise
 except DidNotEnable as e:
 if identifier not in used_as_default_integration:
 raise
Expand Down

12 changes: 0 additions & 12 deletions
sentry_sdk/tracing.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -263,14 +263,6 @@ def start_child(self, instrumenter=INSTRUMENTER.SENTRY, **kwargs):

 return child

 def new_span(self, **kwargs):
 # type: (**Any) -> Span
 """DEPRECATED: use :py:meth:`sentry_sdk.tracing.Span.start_child` instead."""
 logger.warning(
 "Deprecated: use Span.start_child instead of Span.new_span. This will be removed in the future."
 )
 return self.start_child(**kwargs)

 @classmethod
 def continue_from_environ(
 cls,
Expand DownExpand Up@@ -917,10 +909,6 @@ def start_child(self, instrumenter=INSTRUMENTER.SENTRY, **kwargs):
 # type: (str, **Any) -> NoOpSpan
 return NoOpSpan()

 def new_span(self, **kwargs):
 # type: (**Any) -> NoOpSpan
 return self.start_child(**kwargs)

 def to_traceparent(self):
 # type: () -> str
 return ""
Expand Down

55 changes: 0 additions & 55 deletions
tests/test_client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@
)
from sentry_sdk.integrations.executing import ExecutingIntegration
from sentry_sdk.transport import Transport
from sentry_sdk.utils import logger
from sentry_sdk.serializer import MAX_DATABAG_BREADTH
from sentry_sdk.consts import DEFAULT_MAX_BREADCRUMBS, DEFAULT_MAX_VALUE_LENGTH
from sentry_sdk._types import TYPE_CHECKING
Expand DownExpand Up@@ -367,60 +366,6 @@ def e(exc):
 assert mock_capture_internal_exception.call_args[0][0][0] == EventCapturedError


def test_with_locals_deprecation_enabled(sentry_init):
 with mock.patch.object(logger, "warning", mock.Mock()) as fake_warning:
 sentry_init(with_locals=True)

 client = Hub.current.client
 assert "with_locals" not in client.options
 assert "include_local_variables" in client.options
 assert client.options["include_local_variables"]

 fake_warning.assert_called_once_with(
 "Deprecated: The option 'with_locals' was renamed to 'include_local_variables'. Please use 'include_local_variables'. The option 'with_locals' will be removed in the future."
 )


def test_with_locals_deprecation_disabled(sentry_init):
 with mock.patch.object(logger, "warning", mock.Mock()) as fake_warning:
 sentry_init(with_locals=False)

 client = Hub.current.client
 assert "with_locals" not in client.options
 assert "include_local_variables" in client.options
 assert not client.options["include_local_variables"]

 fake_warning.assert_called_once_with(
 "Deprecated: The option 'with_locals' was renamed to 'include_local_variables'. Please use 'include_local_variables'. The option 'with_locals' will be removed in the future."
 )


def test_include_local_variables_deprecation(sentry_init):
 with mock.patch.object(logger, "warning", mock.Mock()) as fake_warning:
 sentry_init(include_local_variables=False)

 client = Hub.current.client
 assert "with_locals" not in client.options
 assert "include_local_variables" in client.options
 assert not client.options["include_local_variables"]

 fake_warning.assert_not_called()


def test_request_bodies_deprecation(sentry_init):
 with mock.patch.object(logger, "warning", mock.Mock()) as fake_warning:
 sentry_init(request_bodies="small")

 client = Hub.current.client
 assert "request_bodies" not in client.options
 assert "max_request_body_size" in client.options
 assert client.options["max_request_body_size"] == "small"

 fake_warning.assert_called_once_with(
 "Deprecated: The option 'request_bodies' was renamed to 'max_request_body_size'. Please use 'max_request_body_size'. The option 'request_bodies' will be removed in the future."
 )


def test_include_local_variables_enabled(sentry_init, capture_events):
 sentry_init(include_local_variables=True)
 events = capture_events()
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove deprecated code#2666

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

sentrivana
merged 6 commits into

from

Jan 29, 2024
 Merged


Remove deprecated code
#2666
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
ddc5c33

Remove deprecated client options


sentrivana Jan 22, 2024
68f920d

Merge branch 'sentry-sdk-2.0' into ivana/2.0/remove-deprecated-code


sentrivana Jan 23, 2024
144aa17

Remove .install()


sentrivana Jan 23, 2024
772ad20

Remove new_span


sentrivana Jan 23, 2024
d2d0bf3

another new_span


sentrivana Jan 23, 2024
a32bfa8

Merge branch 'sentry-sdk-2.0' into ivana/2.0/remove-deprecated-code


sentrivana Jan 29, 2024

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


5 changes: 5 additions & 0 deletions
MIGRATION_GUIDE.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,11 @@
- Removed support for Flask 0.\*.
- `sentry_sdk._functools` was removed.
- A number of compatibility utilities were removed from `sentry_sdk._compat`: the constants `PY2` and `PY33`; the functions `datetime_utcnow`, `utc_from_timestamp`, `implements_str`, `contextmanager`; and the aliases `text_type`, `string_types`, `number_types`, `int_types`, `iteritems`, `binary_sequence_types`.
- The deprecated `with_locals` configuration option was removed. Use `include_local_variables` instead. See https://docs.sentry.io/platforms/python/configuration/options/#include-local-variables.
- The deprecated `request_bodies` configuration option was removed. Use `max_request_body_size`. See https://docs.sentry.io/platforms/python/configuration/options/#max-request-body-size.
- Removed `tracing_utils_py2.py`. The `start_child_span_decorator` is now in `sentry_sdk.tracing_utils`.
- Removed support for the `install` method for custom integrations. Please use `setup_once` instead.
- Removed `sentry_sdk.tracing.Span.new_span`. Use `sentry_sdk.tracing.Span.start_child` instead.
- Removed `sentry_sdk.tracing.Transaction.new_span`. Use `sentry_sdk.tracing.Transaction.start_child` instead.

## Deprecated

20 changes: 0 additions & 20 deletions
sentry_sdk/client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,26 +80,6 @@ def _get_options(*args, **kwargs):

 for key, value in options.items():
 if key not in rv:
 # Option "with_locals" was renamed to "include_local_variables"
 if key == "with_locals":
 msg = (
 "Deprecated: The option 'with_locals' was renamed to 'include_local_variables'. "
 "Please use 'include_local_variables'. The option 'with_locals' will be removed in the future."
 )
 logger.warning(msg)
 rv["include_local_variables"] = value
 continue

 # Option "request_bodies" was renamed to "max_request_body_size"
 if key == "request_bodies":
 msg = (
 "Deprecated: The option 'request_bodies' was renamed to 'max_request_body_size'. "
 "Please use 'max_request_body_size'. The option 'request_bodies' will be removed in the future."
 )
 logger.warning(msg)
 rv["max_request_body_size"] = value
 continue

 raise TypeError("Unknown option %r" % (key,))

 rv[key] = value
Expand Down

10 changes: 0 additions & 10 deletions
sentry_sdk/integrations/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -143,16 +143,6 @@ def setup_integrations(
 )
 try:
 type(integration).setup_once()
 except NotImplementedError:
 if getattr(integration, "install", None) is not None:
 logger.warning(
 "Integration %s: The install method is "
 "deprecated. Use `setup_once`.",
 identifier,
 )
 integration.install() # type: ignore
 else:
 raise
 except DidNotEnable as e:
 if identifier not in used_as_default_integration:
 raise
Expand Down

12 changes: 0 additions & 12 deletions
sentry_sdk/tracing.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -263,14 +263,6 @@ def start_child(self, instrumenter=INSTRUMENTER.SENTRY, **kwargs):

 return child

 def new_span(self, **kwargs):
 # type: (**Any) -> Span
 """DEPRECATED: use :py:meth:`sentry_sdk.tracing.Span.start_child` instead."""
 logger.warning(
 "Deprecated: use Span.start_child instead of Span.new_span. This will be removed in the future."
 )
 return self.start_child(**kwargs)

 @classmethod
 def continue_from_environ(
 cls,
Expand DownExpand Up@@ -917,10 +909,6 @@ def start_child(self, instrumenter=INSTRUMENTER.SENTRY, **kwargs):
 # type: (str, **Any) -> NoOpSpan
 return NoOpSpan()

 def new_span(self, **kwargs):
 # type: (**Any) -> NoOpSpan
 return self.start_child(**kwargs)

 def to_traceparent(self):
 # type: () -> str
 return ""
Expand Down

55 changes: 0 additions & 55 deletions
tests/test_client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@
)
from sentry_sdk.integrations.executing import ExecutingIntegration
from sentry_sdk.transport import Transport
from sentry_sdk.utils import logger
from sentry_sdk.serializer import MAX_DATABAG_BREADTH
from sentry_sdk.consts import DEFAULT_MAX_BREADCRUMBS, DEFAULT_MAX_VALUE_LENGTH
from sentry_sdk._types import TYPE_CHECKING
Expand DownExpand Up@@ -367,60 +366,6 @@ def e(exc):
 assert mock_capture_internal_exception.call_args[0][0][0] == EventCapturedError


def test_with_locals_deprecation_enabled(sentry_init):
 with mock.patch.object(logger, "warning", mock.Mock()) as fake_warning:
 sentry_init(with_locals=True)

 client = Hub.current.client
 assert "with_locals" not in client.options
 assert "include_local_variables" in client.options
 assert client.options["include_local_variables"]

 fake_warning.assert_called_once_with(
 "Deprecated: The option 'with_locals' was renamed to 'include_local_variables'. Please use 'include_local_variables'. The option 'with_locals' will be removed in the future."
 )


def test_with_locals_deprecation_disabled(sentry_init):
 with mock.patch.object(logger, "warning", mock.Mock()) as fake_warning:
 sentry_init(with_locals=False)

 client = Hub.current.client
 assert "with_locals" not in client.options
 assert "include_local_variables" in client.options
 assert not client.options["include_local_variables"]

 fake_warning.assert_called_once_with(
 "Deprecated: The option 'with_locals' was renamed to 'include_local_variables'. Please use 'include_local_variables'. The option 'with_locals' will be removed in the future."
 )


def test_include_local_variables_deprecation(sentry_init):
 with mock.patch.object(logger, "warning", mock.Mock()) as fake_warning:
 sentry_init(include_local_variables=False)

 client = Hub.current.client
 assert "with_locals" not in client.options
 assert "include_local_variables" in client.options
 assert not client.options["include_local_variables"]

 fake_warning.assert_not_called()


def test_request_bodies_deprecation(sentry_init):
 with mock.patch.object(logger, "warning", mock.Mock()) as fake_warning:
 sentry_init(request_bodies="small")

 client = Hub.current.client
 assert "request_bodies" not in client.options
 assert "max_request_body_size" in client.options
 assert client.options["max_request_body_size"] == "small"

 fake_warning.assert_called_once_with(
 "Deprecated: The option 'request_bodies' was renamed to 'max_request_body_size'. Please use 'max_request_body_size'. The option 'request_bodies' will be removed in the future."
 )


def test_include_local_variables_enabled(sentry_init, capture_events):
 sentry_init(include_local_variables=True)
 events = capture_events()
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove deprecated code#2666

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

sentrivana
merged 6 commits into

from

Jan 29, 2024
 Merged


Remove deprecated code
#2666
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
ddc5c33

Remove deprecated client options


sentrivana Jan 22, 2024
68f920d

Merge branch 'sentry-sdk-2.0' into ivana/2.0/remove-deprecated-code


sentrivana Jan 23, 2024
144aa17

Remove .install()


sentrivana Jan 23, 2024
772ad20

Remove new_span


sentrivana Jan 23, 2024
d2d0bf3

another new_span


sentrivana Jan 23, 2024
a32bfa8

Merge branch 'sentry-sdk-2.0' into ivana/2.0/remove-deprecated-code


sentrivana Jan 29, 2024

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


5 changes: 5 additions & 0 deletions
MIGRATION_GUIDE.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,11 @@
- Removed support for Flask 0.\*.
- `sentry_sdk._functools` was removed.
- A number of compatibility utilities were removed from `sentry_sdk._compat`: the constants `PY2` and `PY33`; the functions `datetime_utcnow`, `utc_from_timestamp`, `implements_str`, `contextmanager`; and the aliases `text_type`, `string_types`, `number_types`, `int_types`, `iteritems`, `binary_sequence_types`.
- The deprecated `with_locals` configuration option was removed. Use `include_local_variables` instead. See https://docs.sentry.io/platforms/python/configuration/options/#include-local-variables.
- The deprecated `request_bodies` configuration option was removed. Use `max_request_body_size`. See https://docs.sentry.io/platforms/python/configuration/options/#max-request-body-size.
- Removed `tracing_utils_py2.py`. The `start_child_span_decorator` is now in `sentry_sdk.tracing_utils`.
- Removed support for the `install` method for custom integrations. Please use `setup_once` instead.
- Removed `sentry_sdk.tracing.Span.new_span`. Use `sentry_sdk.tracing.Span.start_child` instead.
- Removed `sentry_sdk.tracing.Transaction.new_span`. Use `sentry_sdk.tracing.Transaction.start_child` instead.

## Deprecated

20 changes: 0 additions & 20 deletions
sentry_sdk/client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,26 +80,6 @@ def _get_options(*args, **kwargs):

 for key, value in options.items():
 if key not in rv:
 # Option "with_locals" was renamed to "include_local_variables"
 if key == "with_locals":
 msg = (
 "Deprecated: The option 'with_locals' was renamed to 'include_local_variables'. "
 "Please use 'include_local_variables'. The option 'with_locals' will be removed in the future."
 )
 logger.warning(msg)
 rv["include_local_variables"] = value
 continue

 # Option "request_bodies" was renamed to "max_request_body_size"
 if key == "request_bodies":
 msg = (
 "Deprecated: The option 'request_bodies' was renamed to 'max_request_body_size'. "
 "Please use 'max_request_body_size'. The option 'request_bodies' will be removed in the future."
 )
 logger.warning(msg)
 rv["max_request_body_size"] = value
 continue

 raise TypeError("Unknown option %r" % (key,))

 rv[key] = value
Expand Down

10 changes: 0 additions & 10 deletions
sentry_sdk/integrations/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -143,16 +143,6 @@ def setup_integrations(
 )
 try:
 type(integration).setup_once()
 except NotImplementedError:
 if getattr(integration, "install", None) is not None:
 logger.warning(
 "Integration %s: The install method is "
 "deprecated. Use `setup_once`.",
 identifier,
 )
 integration.install() # type: ignore
 else:
 raise
 except DidNotEnable as e:
 if identifier not in used_as_default_integration:
 raise
Expand Down

12 changes: 0 additions & 12 deletions
sentry_sdk/tracing.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -263,14 +263,6 @@ def start_child(self, instrumenter=INSTRUMENTER.SENTRY, **kwargs):

 return child

 def new_span(self, **kwargs):
 # type: (**Any) -> Span
 """DEPRECATED: use :py:meth:`sentry_sdk.tracing.Span.start_child` instead."""
 logger.warning(
 "Deprecated: use Span.start_child instead of Span.new_span. This will be removed in the future."
 )
 return self.start_child(**kwargs)

 @classmethod
 def continue_from_environ(
 cls,
Expand DownExpand Up@@ -917,10 +909,6 @@ def start_child(self, instrumenter=INSTRUMENTER.SENTRY, **kwargs):
 # type: (str, **Any) -> NoOpSpan
 return NoOpSpan()

 def new_span(self, **kwargs):
 # type: (**Any) -> NoOpSpan
 return self.start_child(**kwargs)

 def to_traceparent(self):
 # type: () -> str
 return ""
Expand Down

55 changes: 0 additions & 55 deletions
tests/test_client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@
)
from sentry_sdk.integrations.executing import ExecutingIntegration
from sentry_sdk.transport import Transport
from sentry_sdk.utils import logger
from sentry_sdk.serializer import MAX_DATABAG_BREADTH
from sentry_sdk.consts import DEFAULT_MAX_BREADCRUMBS, DEFAULT_MAX_VALUE_LENGTH
from sentry_sdk._types import TYPE_CHECKING
Expand DownExpand Up@@ -367,60 +366,6 @@ def e(exc):
 assert mock_capture_internal_exception.call_args[0][0][0] == EventCapturedError


def test_with_locals_deprecation_enabled(sentry_init):
 with mock.patch.object(logger, "warning", mock.Mock()) as fake_warning:
 sentry_init(with_locals=True)

 client = Hub.current.client
 assert "with_locals" not in client.options
 assert "include_local_variables" in client.options
 assert client.options["include_local_variables"]

 fake_warning.assert_called_once_with(
 "Deprecated: The option 'with_locals' was renamed to 'include_local_variables'. Please use 'include_local_variables'. The option 'with_locals' will be removed in the future."
 )


def test_with_locals_deprecation_disabled(sentry_init):
 with mock.patch.object(logger, "warning", mock.Mock()) as fake_warning:
 sentry_init(with_locals=False)

 client = Hub.current.client
 assert "with_locals" not in client.options
 assert "include_local_variables" in client.options
 assert not client.options["include_local_variables"]

 fake_warning.assert_called_once_with(
 "Deprecated: The option 'with_locals' was renamed to 'include_local_variables'. Please use 'include_local_variables'. The option 'with_locals' will be removed in the future."
 )


def test_include_local_variables_deprecation(sentry_init):
 with mock.patch.object(logger, "warning", mock.Mock()) as fake_warning:
 sentry_init(include_local_variables=False)

 client = Hub.current.client
 assert "with_locals" not in client.options
 assert "include_local_variables" in client.options
 assert not client.options["include_local_variables"]

 fake_warning.assert_not_called()


def test_request_bodies_deprecation(sentry_init):
 with mock.patch.object(logger, "warning", mock.Mock()) as fake_warning:
 sentry_init(request_bodies="small")

 client = Hub.current.client
 assert "request_bodies" not in client.options
 assert "max_request_body_size" in client.options
 assert client.options["max_request_body_size"] == "small"

 fake_warning.assert_called_once_with(
 "Deprecated: The option 'request_bodies' was renamed to 'max_request_body_size'. Please use 'max_request_body_size'. The option 'request_bodies' will be removed in the future."
 )


def test_include_local_variables_enabled(sentry_init, capture_events):
 sentry_init(include_local_variables=True)
 events = capture_events()
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Remove deprecated code#2666

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

sentrivana
merged 6 commits into

from

Jan 29, 2024
 Merged


Remove deprecated code
#2666
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
ddc5c33

Remove deprecated client options


sentrivana Jan 22, 2024
68f920d

Merge branch 'sentry-sdk-2.0' into ivana/2.0/remove-deprecated-code


sentrivana Jan 23, 2024
144aa17

Remove .install()


sentrivana Jan 23, 2024
772ad20

Remove new_span


sentrivana Jan 23, 2024
d2d0bf3

another new_span


sentrivana Jan 23, 2024
a32bfa8

Merge branch 'sentry-sdk-2.0' into ivana/2.0/remove-deprecated-code


sentrivana Jan 29, 2024

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


5 changes: 5 additions & 0 deletions
MIGRATION_GUIDE.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,11 @@
- Removed support for Flask 0.\*.
- `sentry_sdk._functools` was removed.
- A number of compatibility utilities were removed from `sentry_sdk._compat`: the constants `PY2` and `PY33`; the functions `datetime_utcnow`, `utc_from_timestamp`, `implements_str`, `contextmanager`; and the aliases `text_type`, `string_types`, `number_types`, `int_types`, `iteritems`, `binary_sequence_types`.
- The deprecated `with_locals` configuration option was removed. Use `include_local_variables` instead. See https://docs.sentry.io/platforms/python/configuration/options/#include-local-variables.
- The deprecated `request_bodies` configuration option was removed. Use `max_request_body_size`. See https://docs.sentry.io/platforms/python/configuration/options/#max-request-body-size.
- Removed `tracing_utils_py2.py`. The `start_child_span_decorator` is now in `sentry_sdk.tracing_utils`.
- Removed support for the `install` method for custom integrations. Please use `setup_once` instead.
- Removed `sentry_sdk.tracing.Span.new_span`. Use `sentry_sdk.tracing.Span.start_child` instead.
- Removed `sentry_sdk.tracing.Transaction.new_span`. Use `sentry_sdk.tracing.Transaction.start_child` instead.

## Deprecated

20 changes: 0 additions & 20 deletions
sentry_sdk/client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,26 +80,6 @@ def _get_options(*args, **kwargs):

 for key, value in options.items():
 if key not in rv:
 # Option "with_locals" was renamed to "include_local_variables"
 if key == "with_locals":
 msg = (
 "Deprecated: The option 'with_locals' was renamed to 'include_local_variables'. "
 "Please use 'include_local_variables'. The option 'with_locals' will be removed in the future."
 )
 logger.warning(msg)
 rv["include_local_variables"] = value
 continue

 # Option "request_bodies" was renamed to "max_request_body_size"
 if key == "request_bodies":
 msg = (
 "Deprecated: The option 'request_bodies' was renamed to 'max_request_body_size'. "
 "Please use 'max_request_body_size'. The option 'request_bodies' will be removed in the future."
 )
 logger.warning(msg)
 rv["max_request_body_size"] = value
 continue

 raise TypeError("Unknown option %r" % (key,))

 rv[key] = value
Expand Down

10 changes: 0 additions & 10 deletions
sentry_sdk/integrations/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -143,16 +143,6 @@ def setup_integrations(
 )
 try:
 type(integration).setup_once()
 except NotImplementedError:
 if getattr(integration, "install", None) is not None:
 logger.warning(
 "Integration %s: The install method is "
 "deprecated. Use `setup_once`.",
 identifier,
 )
 integration.install() # type: ignore
 else:
 raise
 except DidNotEnable as e:
 if identifier not in used_as_default_integration:
 raise
Expand Down

12 changes: 0 additions & 12 deletions
sentry_sdk/tracing.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -263,14 +263,6 @@ def start_child(self, instrumenter=INSTRUMENTER.SENTRY, **kwargs):

 return child

 def new_span(self, **kwargs):
 # type: (**Any) -> Span
 """DEPRECATED: use :py:meth:`sentry_sdk.tracing.Span.start_child` instead."""
 logger.warning(
 "Deprecated: use Span.start_child instead of Span.new_span. This will be removed in the future."
 )
 return self.start_child(**kwargs)

 @classmethod
 def continue_from_environ(
 cls,
Expand DownExpand Up@@ -917,10 +909,6 @@ def start_child(self, instrumenter=INSTRUMENTER.SENTRY, **kwargs):
 # type: (str, **Any) -> NoOpSpan
 return NoOpSpan()

 def new_span(self, **kwargs):
 # type: (**Any) -> NoOpSpan
 return self.start_child(**kwargs)

 def to_traceparent(self):
 # type: () -> str
 return ""
Expand Down

55 changes: 0 additions & 55 deletions
tests/test_client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@
)
from sentry_sdk.integrations.executing import ExecutingIntegration
from sentry_sdk.transport import Transport
from sentry_sdk.utils import logger
from sentry_sdk.serializer import MAX_DATABAG_BREADTH
from sentry_sdk.consts import DEFAULT_MAX_BREADCRUMBS, DEFAULT_MAX_VALUE_LENGTH
from sentry_sdk._types import TYPE_CHECKING
Expand DownExpand Up@@ -367,60 +366,6 @@ def e(exc):
 assert mock_capture_internal_exception.call_args[0][0][0] == EventCapturedError


def test_with_locals_deprecation_enabled(sentry_init):
 with mock.patch.object(logger, "warning", mock.Mock()) as fake_warning:
 sentry_init(with_locals=True)

 client = Hub.current.client
 assert "with_locals" not in client.options
 assert "include_local_variables" in client.options
 assert client.options["include_local_variables"]

 fake_warning.assert_called_once_with(
 "Deprecated: The option 'with_locals' was renamed to 'include_local_variables'. Please use 'include_local_variables'. The option 'with_locals' will be removed in the future."
 )


def test_with_locals_deprecation_disabled(sentry_init):
 with mock.patch.object(logger, "warning", mock.Mock()) as fake_warning:
 sentry_init(with_locals=False)

 client = Hub.current.client
 assert "with_locals" not in client.options
 assert "include_local_variables" in client.options
 assert not client.options["include_local_variables"]

 fake_warning.assert_called_once_with(
 "Deprecated: The option 'with_locals' was renamed to 'include_local_variables'. Please use 'include_local_variables'. The option 'with_locals' will be removed in the future."
 )


def test_include_local_variables_deprecation(sentry_init):
 with mock.patch.object(logger, "warning", mock.Mock()) as fake_warning:
 sentry_init(include_local_variables=False)

 client = Hub.current.client
 assert "with_locals" not in client.options
 assert "include_local_variables" in client.options
 assert not client.options["include_local_variables"]

 fake_warning.assert_not_called()


def test_request_bodies_deprecation(sentry_init):
 with mock.patch.object(logger, "warning", mock.Mock()) as fake_warning:
 sentry_init(request_bodies="small")

 client = Hub.current.client
 assert "request_bodies" not in client.options
 assert "max_request_body_size" in client.options
 assert client.options["max_request_body_size"] == "small"

 fake_warning.assert_called_once_with(
 "Deprecated: The option 'request_bodies' was renamed to 'max_request_body_size'. Please use 'max_request_body_size'. The option 'request_bodies' will be removed in the future."
 )


def test_include_local_variables_enabled(sentry_init, capture_events):
 sentry_init(include_local_variables=True)
 events = capture_events()
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove deprecated code#2666

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

sentrivana
merged 6 commits into

from

Jan 29, 2024
 Merged


Remove deprecated code
#2666
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
ddc5c33

Remove deprecated client options


sentrivana Jan 22, 2024
68f920d

Merge branch 'sentry-sdk-2.0' into ivana/2.0/remove-deprecated-code


sentrivana Jan 23, 2024
144aa17

Remove .install()


sentrivana Jan 23, 2024
772ad20

Remove new_span


sentrivana Jan 23, 2024
d2d0bf3

another new_span


sentrivana Jan 23, 2024
a32bfa8

Merge branch 'sentry-sdk-2.0' into ivana/2.0/remove-deprecated-code


sentrivana Jan 29, 2024

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


5 changes: 5 additions & 0 deletions
MIGRATION_GUIDE.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,11 @@
- Removed support for Flask 0.\*.
- `sentry_sdk._functools` was removed.
- A number of compatibility utilities were removed from `sentry_sdk._compat`: the constants `PY2` and `PY33`; the functions `datetime_utcnow`, `utc_from_timestamp`, `implements_str`, `contextmanager`; and the aliases `text_type`, `string_types`, `number_types`, `int_types`, `iteritems`, `binary_sequence_types`.
- The deprecated `with_locals` configuration option was removed. Use `include_local_variables` instead. See https://docs.sentry.io/platforms/python/configuration/options/#include-local-variables.
- The deprecated `request_bodies` configuration option was removed. Use `max_request_body_size`. See https://docs.sentry.io/platforms/python/configuration/options/#max-request-body-size.
- Removed `tracing_utils_py2.py`. The `start_child_span_decorator` is now in `sentry_sdk.tracing_utils`.
- Removed support for the `install` method for custom integrations. Please use `setup_once` instead.
- Removed `sentry_sdk.tracing.Span.new_span`. Use `sentry_sdk.tracing.Span.start_child` instead.
- Removed `sentry_sdk.tracing.Transaction.new_span`. Use `sentry_sdk.tracing.Transaction.start_child` instead.

## Deprecated

20 changes: 0 additions & 20 deletions
sentry_sdk/client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,26 +80,6 @@ def _get_options(*args, **kwargs):

 for key, value in options.items():
 if key not in rv:
 # Option "with_locals" was renamed to "include_local_variables"
 if key == "with_locals":
 msg = (
 "Deprecated: The option 'with_locals' was renamed to 'include_local_variables'. "
 "Please use 'include_local_variables'. The option 'with_locals' will be removed in the future."
 )
 logger.warning(msg)
 rv["include_local_variables"] = value
 continue

 # Option "request_bodies" was renamed to "max_request_body_size"
 if key == "request_bodies":
 msg = (
 "Deprecated: The option 'request_bodies' was renamed to 'max_request_body_size'. "
 "Please use 'max_request_body_size'. The option 'request_bodies' will be removed in the future."
 )
 logger.warning(msg)
 rv["max_request_body_size"] = value
 continue

 raise TypeError("Unknown option %r" % (key,))

 rv[key] = value
Expand Down

10 changes: 0 additions & 10 deletions
sentry_sdk/integrations/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -143,16 +143,6 @@ def setup_integrations(
 )
 try:
 type(integration).setup_once()
 except NotImplementedError:
 if getattr(integration, "install", None) is not None:
 logger.warning(
 "Integration %s: The install method is "
 "deprecated. Use `setup_once`.",
 identifier,
 )
 integration.install() # type: ignore
 else:
 raise
 except DidNotEnable as e:
 if identifier not in used_as_default_integration:
 raise
Expand Down

12 changes: 0 additions & 12 deletions
sentry_sdk/tracing.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -263,14 +263,6 @@ def start_child(self, instrumenter=INSTRUMENTER.SENTRY, **kwargs):

 return child

 def new_span(self, **kwargs):
 # type: (**Any) -> Span
 """DEPRECATED: use :py:meth:`sentry_sdk.tracing.Span.start_child` instead."""
 logger.warning(
 "Deprecated: use Span.start_child instead of Span.new_span. This will be removed in the future."
 )
 return self.start_child(**kwargs)

 @classmethod
 def continue_from_environ(
 cls,
Expand DownExpand Up@@ -917,10 +909,6 @@ def start_child(self, instrumenter=INSTRUMENTER.SENTRY, **kwargs):
 # type: (str, **Any) -> NoOpSpan
 return NoOpSpan()

 def new_span(self, **kwargs):
 # type: (**Any) -> NoOpSpan
 return self.start_child(**kwargs)

 def to_traceparent(self):
 # type: () -> str
 return ""
Expand Down

55 changes: 0 additions & 55 deletions
tests/test_client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@
)
from sentry_sdk.integrations.executing import ExecutingIntegration
from sentry_sdk.transport import Transport
from sentry_sdk.utils import logger
from sentry_sdk.serializer import MAX_DATABAG_BREADTH
from sentry_sdk.consts import DEFAULT_MAX_BREADCRUMBS, DEFAULT_MAX_VALUE_LENGTH
from sentry_sdk._types import TYPE_CHECKING
Expand DownExpand Up@@ -367,60 +366,6 @@ def e(exc):
 assert mock_capture_internal_exception.call_args[0][0][0] == EventCapturedError


def test_with_locals_deprecation_enabled(sentry_init):
 with mock.patch.object(logger, "warning", mock.Mock()) as fake_warning:
 sentry_init(with_locals=True)

 client = Hub.current.client
 assert "with_locals" not in client.options
 assert "include_local_variables" in client.options
 assert client.options["include_local_variables"]

 fake_warning.assert_called_once_with(
 "Deprecated: The option 'with_locals' was renamed to 'include_local_variables'. Please use 'include_local_variables'. The option 'with_locals' will be removed in the future."
 )


def test_with_locals_deprecation_disabled(sentry_init):
 with mock.patch.object(logger, "warning", mock.Mock()) as fake_warning:
 sentry_init(with_locals=False)

 client = Hub.current.client
 assert "with_locals" not in client.options
 assert "include_local_variables" in client.options
 assert not client.options["include_local_variables"]

 fake_warning.assert_called_once_with(
 "Deprecated: The option 'with_locals' was renamed to 'include_local_variables'. Please use 'include_local_variables'. The option 'with_locals' will be removed in the future."
 )


def test_include_local_variables_deprecation(sentry_init):
 with mock.patch.object(logger, "warning", mock.Mock()) as fake_warning:
 sentry_init(include_local_variables=False)

 client = Hub.current.client
 assert "with_locals" not in client.options
 assert "include_local_variables" in client.options
 assert not client.options["include_local_variables"]

 fake_warning.assert_not_called()


def test_request_bodies_deprecation(sentry_init):
 with mock.patch.object(logger, "warning", mock.Mock()) as fake_warning:
 sentry_init(request_bodies="small")

 client = Hub.current.client
 assert "request_bodies" not in client.options
 assert "max_request_body_size" in client.options
 assert client.options["max_request_body_size"] == "small"

 fake_warning.assert_called_once_with(
 "Deprecated: The option 'request_bodies' was renamed to 'max_request_body_size'. Please use 'max_request_body_size'. The option 'request_bodies' will be removed in the future."
 )


def test_include_local_variables_enabled(sentry_init, capture_events):
 sentry_init(include_local_variables=True)
 events = capture_events()
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove deprecated code#2666

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

sentrivana
merged 6 commits into

from

Jan 29, 2024
 Merged


Remove deprecated code
#2666
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
ddc5c33

Remove deprecated client options


sentrivana Jan 22, 2024
68f920d

Merge branch 'sentry-sdk-2.0' into ivana/2.0/remove-deprecated-code


sentrivana Jan 23, 2024
144aa17

Remove .install()


sentrivana Jan 23, 2024
772ad20

Remove new_span


sentrivana Jan 23, 2024
d2d0bf3

another new_span


sentrivana Jan 23, 2024
a32bfa8

Merge branch 'sentry-sdk-2.0' into ivana/2.0/remove-deprecated-code


sentrivana Jan 29, 2024

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


5 changes: 5 additions & 0 deletions
MIGRATION_GUIDE.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,11 @@
- Removed support for Flask 0.\*.
- `sentry_sdk._functools` was removed.
- A number of compatibility utilities were removed from `sentry_sdk._compat`: the constants `PY2` and `PY33`; the functions `datetime_utcnow`, `utc_from_timestamp`, `implements_str`, `contextmanager`; and the aliases `text_type`, `string_types`, `number_types`, `int_types`, `iteritems`, `binary_sequence_types`.
- The deprecated `with_locals` configuration option was removed. Use `include_local_variables` instead. See https://docs.sentry.io/platforms/python/configuration/options/#include-local-variables.
- The deprecated `request_bodies` configuration option was removed. Use `max_request_body_size`. See https://docs.sentry.io/platforms/python/configuration/options/#max-request-body-size.
- Removed `tracing_utils_py2.py`. The `start_child_span_decorator` is now in `sentry_sdk.tracing_utils`.
- Removed support for the `install` method for custom integrations. Please use `setup_once` instead.
- Removed `sentry_sdk.tracing.Span.new_span`. Use `sentry_sdk.tracing.Span.start_child` instead.
- Removed `sentry_sdk.tracing.Transaction.new_span`. Use `sentry_sdk.tracing.Transaction.start_child` instead.

## Deprecated

20 changes: 0 additions & 20 deletions
sentry_sdk/client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,26 +80,6 @@ def _get_options(*args, **kwargs):

 for key, value in options.items():
 if key not in rv:
 # Option "with_locals" was renamed to "include_local_variables"
 if key == "with_locals":
 msg = (
 "Deprecated: The option 'with_locals' was renamed to 'include_local_variables'. "
 "Please use 'include_local_variables'. The option 'with_locals' will be removed in the future."
 )
 logger.warning(msg)
 rv["include_local_variables"] = value
 continue

 # Option "request_bodies" was renamed to "max_request_body_size"
 if key == "request_bodies":
 msg = (
 "Deprecated: The option 'request_bodies' was renamed to 'max_request_body_size'. "
 "Please use 'max_request_body_size'. The option 'request_bodies' will be removed in the future."
 )
 logger.warning(msg)
 rv["max_request_body_size"] = value
 continue

 raise TypeError("Unknown option %r" % (key,))

 rv[key] = value
Expand Down

10 changes: 0 additions & 10 deletions
sentry_sdk/integrations/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -143,16 +143,6 @@ def setup_integrations(
 )
 try:
 type(integration).setup_once()
 except NotImplementedError:
 if getattr(integration, "install", None) is not None:
 logger.warning(
 "Integration %s: The install method is "
 "deprecated. Use `setup_once`.",
 identifier,
 )
 integration.install() # type: ignore
 else:
 raise
 except DidNotEnable as e:
 if identifier not in used_as_default_integration:
 raise
Expand Down

12 changes: 0 additions & 12 deletions
sentry_sdk/tracing.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -263,14 +263,6 @@ def start_child(self, instrumenter=INSTRUMENTER.SENTRY, **kwargs):

 return child

 def new_span(self, **kwargs):
 # type: (**Any) -> Span
 """DEPRECATED: use :py:meth:`sentry_sdk.tracing.Span.start_child` instead."""
 logger.warning(
 "Deprecated: use Span.start_child instead of Span.new_span. This will be removed in the future."
 )
 return self.start_child(**kwargs)

 @classmethod
 def continue_from_environ(
 cls,
Expand DownExpand Up@@ -917,10 +909,6 @@ def start_child(self, instrumenter=INSTRUMENTER.SENTRY, **kwargs):
 # type: (str, **Any) -> NoOpSpan
 return NoOpSpan()

 def new_span(self, **kwargs):
 # type: (**Any) -> NoOpSpan
 return self.start_child(**kwargs)

 def to_traceparent(self):
 # type: () -> str
 return ""
Expand Down

55 changes: 0 additions & 55 deletions
tests/test_client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@
)
from sentry_sdk.integrations.executing import ExecutingIntegration
from sentry_sdk.transport import Transport
from sentry_sdk.utils import logger
from sentry_sdk.serializer import MAX_DATABAG_BREADTH
from sentry_sdk.consts import DEFAULT_MAX_BREADCRUMBS, DEFAULT_MAX_VALUE_LENGTH
from sentry_sdk._types import TYPE_CHECKING
Expand DownExpand Up@@ -367,60 +366,6 @@ def e(exc):
 assert mock_capture_internal_exception.call_args[0][0][0] == EventCapturedError


def test_with_locals_deprecation_enabled(sentry_init):
 with mock.patch.object(logger, "warning", mock.Mock()) as fake_warning:
 sentry_init(with_locals=True)

 client = Hub.current.client
 assert "with_locals" not in client.options
 assert "include_local_variables" in client.options
 assert client.options["include_local_variables"]

 fake_warning.assert_called_once_with(
 "Deprecated: The option 'with_locals' was renamed to 'include_local_variables'. Please use 'include_local_variables'. The option 'with_locals' will be removed in the future."
 )


def test_with_locals_deprecation_disabled(sentry_init):
 with mock.patch.object(logger, "warning", mock.Mock()) as fake_warning:
 sentry_init(with_locals=False)

 client = Hub.current.client
 assert "with_locals" not in client.options
 assert "include_local_variables" in client.options
 assert not client.options["include_local_variables"]

 fake_warning.assert_called_once_with(
 "Deprecated: The option 'with_locals' was renamed to 'include_local_variables'. Please use 'include_local_variables'. The option 'with_locals' will be removed in the future."
 )


def test_include_local_variables_deprecation(sentry_init):
 with mock.patch.object(logger, "warning", mock.Mock()) as fake_warning:
 sentry_init(include_local_variables=False)

 client = Hub.current.client
 assert "with_locals" not in client.options
 assert "include_local_variables" in client.options
 assert not client.options["include_local_variables"]

 fake_warning.assert_not_called()


def test_request_bodies_deprecation(sentry_init):
 with mock.patch.object(logger, "warning", mock.Mock()) as fake_warning:
 sentry_init(request_bodies="small")

 client = Hub.current.client
 assert "request_bodies" not in client.options
 assert "max_request_body_size" in client.options
 assert client.options["max_request_body_size"] == "small"

 fake_warning.assert_called_once_with(
 "Deprecated: The option 'request_bodies' was renamed to 'max_request_body_size'. Please use 'max_request_body_size'. The option 'request_bodies' will be removed in the future."
 )


def test_include_local_variables_enabled(sentry_init, capture_events):
 sentry_init(include_local_variables=True)
 events = capture_events()
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Remove deprecated code#2666

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

sentrivana
merged 6 commits into

from

Jan 29, 2024
 Merged


Remove deprecated code
#2666
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
ddc5c33

Remove deprecated client options


sentrivana Jan 22, 2024
68f920d

Merge branch 'sentry-sdk-2.0' into ivana/2.0/remove-deprecated-code


sentrivana Jan 23, 2024
144aa17

Remove .install()


sentrivana Jan 23, 2024
772ad20

Remove new_span


sentrivana Jan 23, 2024
d2d0bf3

another new_span


sentrivana Jan 23, 2024
a32bfa8

Merge branch 'sentry-sdk-2.0' into ivana/2.0/remove-deprecated-code


sentrivana Jan 29, 2024

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


5 changes: 5 additions & 0 deletions
MIGRATION_GUIDE.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,11 @@
- Removed support for Flask 0.\*.
- `sentry_sdk._functools` was removed.
- A number of compatibility utilities were removed from `sentry_sdk._compat`: the constants `PY2` and `PY33`; the functions `datetime_utcnow`, `utc_from_timestamp`, `implements_str`, `contextmanager`; and the aliases `text_type`, `string_types`, `number_types`, `int_types`, `iteritems`, `binary_sequence_types`.
- The deprecated `with_locals` configuration option was removed. Use `include_local_variables` instead. See https://docs.sentry.io/platforms/python/configuration/options/#include-local-variables.
- The deprecated `request_bodies` configuration option was removed. Use `max_request_body_size`. See https://docs.sentry.io/platforms/python/configuration/options/#max-request-body-size.
- Removed `tracing_utils_py2.py`. The `start_child_span_decorator` is now in `sentry_sdk.tracing_utils`.
- Removed support for the `install` method for custom integrations. Please use `setup_once` instead.
- Removed `sentry_sdk.tracing.Span.new_span`. Use `sentry_sdk.tracing.Span.start_child` instead.
- Removed `sentry_sdk.tracing.Transaction.new_span`. Use `sentry_sdk.tracing.Transaction.start_child` instead.

## Deprecated

20 changes: 0 additions & 20 deletions
sentry_sdk/client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,26 +80,6 @@ def _get_options(*args, **kwargs):

 for key, value in options.items():
 if key not in rv:
 # Option "with_locals" was renamed to "include_local_variables"
 if key == "with_locals":
 msg = (
 "Deprecated: The option 'with_locals' was renamed to 'include_local_variables'. "
 "Please use 'include_local_variables'. The option 'with_locals' will be removed in the future."
 )
 logger.warning(msg)
 rv["include_local_variables"] = value
 continue

 # Option "request_bodies" was renamed to "max_request_body_size"
 if key == "request_bodies":
 msg = (
 "Deprecated: The option 'request_bodies' was renamed to 'max_request_body_size'. "
 "Please use 'max_request_body_size'. The option 'request_bodies' will be removed in the future."
 )
 logger.warning(msg)
 rv["max_request_body_size"] = value
 continue

 raise TypeError("Unknown option %r" % (key,))

 rv[key] = value
Expand Down

10 changes: 0 additions & 10 deletions
sentry_sdk/integrations/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -143,16 +143,6 @@ def setup_integrations(
 )
 try:
 type(integration).setup_once()
 except NotImplementedError:
 if getattr(integration, "install", None) is not None:
 logger.warning(
 "Integration %s: The install method is "
 "deprecated. Use `setup_once`.",
 identifier,
 )
 integration.install() # type: ignore
 else:
 raise
 except DidNotEnable as e:
 if identifier not in used_as_default_integration:
 raise
Expand Down

12 changes: 0 additions & 12 deletions
sentry_sdk/tracing.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -263,14 +263,6 @@ def start_child(self, instrumenter=INSTRUMENTER.SENTRY, **kwargs):

 return child

 def new_span(self, **kwargs):
 # type: (**Any) -> Span
 """DEPRECATED: use :py:meth:`sentry_sdk.tracing.Span.start_child` instead."""
 logger.warning(
 "Deprecated: use Span.start_child instead of Span.new_span. This will be removed in the future."
 )
 return self.start_child(**kwargs)

 @classmethod
 def continue_from_environ(
 cls,
Expand DownExpand Up@@ -917,10 +909,6 @@ def start_child(self, instrumenter=INSTRUMENTER.SENTRY, **kwargs):
 # type: (str, **Any) -> NoOpSpan
 return NoOpSpan()

 def new_span(self, **kwargs):
 # type: (**Any) -> NoOpSpan
 return self.start_child(**kwargs)

 def to_traceparent(self):
 # type: () -> str
 return ""
Expand Down

55 changes: 0 additions & 55 deletions
tests/test_client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@
)
from sentry_sdk.integrations.executing import ExecutingIntegration
from sentry_sdk.transport import Transport
from sentry_sdk.utils import logger
from sentry_sdk.serializer import MAX_DATABAG_BREADTH
from sentry_sdk.consts import DEFAULT_MAX_BREADCRUMBS, DEFAULT_MAX_VALUE_LENGTH
from sentry_sdk._types import TYPE_CHECKING
Expand DownExpand Up@@ -367,60 +366,6 @@ def e(exc):
 assert mock_capture_internal_exception.call_args[0][0][0] == EventCapturedError


def test_with_locals_deprecation_enabled(sentry_init):
 with mock.patch.object(logger, "warning", mock.Mock()) as fake_warning:
 sentry_init(with_locals=True)

 client = Hub.current.client
 assert "with_locals" not in client.options
 assert "include_local_variables" in client.options
 assert client.options["include_local_variables"]

 fake_warning.assert_called_once_with(
 "Deprecated: The option 'with_locals' was renamed to 'include_local_variables'. Please use 'include_local_variables'. The option 'with_locals' will be removed in the future."
 )


def test_with_locals_deprecation_disabled(sentry_init):
 with mock.patch.object(logger, "warning", mock.Mock()) as fake_warning:
 sentry_init(with_locals=False)

 client = Hub.current.client
 assert "with_locals" not in client.options
 assert "include_local_variables" in client.options
 assert not client.options["include_local_variables"]

 fake_warning.assert_called_once_with(
 "Deprecated: The option 'with_locals' was renamed to 'include_local_variables'. Please use 'include_local_variables'. The option 'with_locals' will be removed in the future."
 )


def test_include_local_variables_deprecation(sentry_init):
 with mock.patch.object(logger, "warning", mock.Mock()) as fake_warning:
 sentry_init(include_local_variables=False)

 client = Hub.current.client
 assert "with_locals" not in client.options
 assert "include_local_variables" in client.options
 assert not client.options["include_local_variables"]

 fake_warning.assert_not_called()


def test_request_bodies_deprecation(sentry_init):
 with mock.patch.object(logger, "warning", mock.Mock()) as fake_warning:
 sentry_init(request_bodies="small")

 client = Hub.current.client
 assert "request_bodies" not in client.options
 assert "max_request_body_size" in client.options
 assert client.options["max_request_body_size"] == "small"

 fake_warning.assert_called_once_with(
 "Deprecated: The option 'request_bodies' was renamed to 'max_request_body_size'. Please use 'max_request_body_size'. The option 'request_bodies' will be removed in the future."
 )


def test_include_local_variables_enabled(sentry_init, capture_events):
 sentry_init(include_local_variables=True)
 events = capture_events()
Expand Down