Skip to content

chore: Remove enable_metrics option #5046

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 3 commits into from
Oct 31, 2025
Merged

chore: Remove enable_metrics option #5046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf44f17
chore: Remove enable_metrics option
alexander-alderman-webb Oct 30, 2025
fd7b155
remove disabled by default test
alexander-alderman-webb Oct 30, 2025
953ad97
preserve type
alexander-alderman-webb Oct 31, 2025
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
11 changes: 3 additions & 8 deletions sentry_sdk/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

import sentry_sdk
from sentry_sdk._compat import PY37, check_uwsgi_thread_support
from sentry_sdk._metrics_batcher import MetricsBatcher
from sentry_sdk.utils import (
AnnotatedValue,
ContextVar,
Expand All @@ -26,7 +27,6 @@
get_before_send_log,
get_before_send_metric,
has_logs_enabled,
has_metrics_enabled,
)
from sentry_sdk.serializer import serialize
from sentry_sdk.tracing import trace
Expand Down Expand Up @@ -374,12 +374,7 @@ def _capture_envelope(envelope):

self.log_batcher = LogBatcher(capture_func=_capture_envelope)

self.metrics_batcher = None

if has_metrics_enabled(self.options):
from sentry_sdk._metrics_batcher import MetricsBatcher

self.metrics_batcher = MetricsBatcher(capture_func=_capture_envelope)
self.metrics_batcher = MetricsBatcher(capture_func=_capture_envelope)

max_request_body_size = ("always", "never", "small", "medium")
if self.options["max_request_body_size"] not in max_request_body_size:
Expand Down Expand Up @@ -978,7 +973,7 @@ def _capture_log(self, log):

def _capture_metric(self, metric):
# type: (Optional[Metric]) -> None
if not has_metrics_enabled(self.options) or metric is None:
if metric is None:
return

isolation_scope = sentry_sdk.get_isolation_scope()
Expand Down
8 changes: 0 additions & 8 deletions sentry_sdk/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2047,14 +2047,6 @@ def get_before_send_log(options):
)


def has_metrics_enabled(options):
# type: (Optional[dict[str, Any]]) -> bool
if options is None:
return False

return bool(options["_experiments"].get("enable_metrics", False))


def get_before_send_metric(options):
# type: (Optional[dict[str, Any]]) -> Optional[Callable[[Metric, Hint], Optional[Metric]]]
if options is None:
Expand Down
27 changes: 6 additions & 21 deletions tests/test_metrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,8 @@ def envelopes_to_metrics(envelopes):
return res


def test_metrics_disabled_by_default(sentry_init, capture_envelopes):
sentry_init()

envelopes = capture_envelopes()

sentry_sdk.metrics.count("test.counter", 1)
sentry_sdk.metrics.gauge("test.gauge", 42)
sentry_sdk.metrics.distribution("test.distribution", 200)

assert len(envelopes) == 0


def test_metrics_basics(sentry_init, capture_envelopes):
sentry_init(_experiments={"enable_metrics": True})
sentry_init()
envelopes = capture_envelopes()

sentry_sdk.metrics.count("test.counter", 1)
Expand Down Expand Up @@ -77,7 +65,7 @@ def test_metrics_basics(sentry_init, capture_envelopes):


def test_metrics_experimental_option(sentry_init, capture_envelopes):
sentry_init(_experiments={"enable_metrics": True})
sentry_init()
envelopes = capture_envelopes()

sentry_sdk.metrics.count("test.counter", 5)
Expand All @@ -93,9 +81,7 @@ def test_metrics_experimental_option(sentry_init, capture_envelopes):


def test_metrics_with_attributes(sentry_init, capture_envelopes):
sentry_init(
_experiments={"enable_metrics": True}, release="1.0.0", environment="test"
)
sentry_init(release="1.0.0", environment="test")
envelopes = capture_envelopes()

sentry_sdk.metrics.count(
Expand All @@ -114,7 +100,7 @@ def test_metrics_with_attributes(sentry_init, capture_envelopes):


def test_metrics_with_user(sentry_init, capture_envelopes):
sentry_init(_experiments={"enable_metrics": True})
sentry_init()
envelopes = capture_envelopes()

sentry_sdk.set_user(
Expand All @@ -133,7 +119,7 @@ def test_metrics_with_user(sentry_init, capture_envelopes):


def test_metrics_with_span(sentry_init, capture_envelopes):
sentry_init(_experiments={"enable_metrics": True}, traces_sample_rate=1.0)
sentry_init(traces_sample_rate=1.0)
envelopes = capture_envelopes()

with sentry_sdk.start_transaction(op="test", name="test-span"):
Expand All @@ -150,7 +136,7 @@ def test_metrics_with_span(sentry_init, capture_envelopes):


def test_metrics_tracing_without_performance(sentry_init, capture_envelopes):
sentry_init(_experiments={"enable_metrics": True})
sentry_init()
envelopes = capture_envelopes()

sentry_sdk.metrics.count("test.span.counter", 1)
Expand Down Expand Up @@ -190,7 +176,6 @@ def _before_metric(record, hint):

sentry_init(
_experiments={
"enable_metrics": True,
"before_send_metric": _before_metric,
},
)
Expand Down