diff --git a/.github/workflows/test-integrations-ai.yml b/.github/workflows/test-integrations-ai.yml index 7878095351..fc7d551249 100644 --- a/.github/workflows/test-integrations-ai.yml +++ b/.github/workflows/test-integrations-ai.yml @@ -70,7 +70,7 @@ jobs: coverage xml - name: Upload coverage to Codecov if: ${{ !cancelled() }} - uses: codecov/codecov-action@v5.4.0 + uses: codecov/codecov-action@v5.4.2 with: token: ${{ secrets.CODECOV_TOKEN }} files: coverage.xml @@ -132,7 +132,7 @@ jobs: coverage xml - name: Upload coverage to Codecov if: ${{ !cancelled() }} - uses: codecov/codecov-action@v5.4.0 + uses: codecov/codecov-action@v5.4.2 with: token: ${{ secrets.CODECOV_TOKEN }} files: coverage.xml diff --git a/.github/workflows/test-integrations-cloud.yml b/.github/workflows/test-integrations-cloud.yml index 24c1bf7838..341e531e31 100644 --- a/.github/workflows/test-integrations-cloud.yml +++ b/.github/workflows/test-integrations-cloud.yml @@ -74,7 +74,7 @@ jobs: coverage xml - name: Upload coverage to Codecov if: ${{ !cancelled() }} - uses: codecov/codecov-action@v5.4.0 + uses: codecov/codecov-action@v5.4.2 with: token: ${{ secrets.CODECOV_TOKEN }} files: coverage.xml @@ -140,7 +140,7 @@ jobs: coverage xml - name: Upload coverage to Codecov if: ${{ !cancelled() }} - uses: codecov/codecov-action@v5.4.0 + uses: codecov/codecov-action@v5.4.2 with: token: ${{ secrets.CODECOV_TOKEN }} files: coverage.xml diff --git a/.github/workflows/test-integrations-common.yml b/.github/workflows/test-integrations-common.yml index 9b13276313..59524f2d93 100644 --- a/.github/workflows/test-integrations-common.yml +++ b/.github/workflows/test-integrations-common.yml @@ -54,7 +54,7 @@ jobs: coverage xml - name: Upload coverage to Codecov if: ${{ !cancelled() }} - uses: codecov/codecov-action@v5.4.0 + uses: codecov/codecov-action@v5.4.2 with: token: ${{ secrets.CODECOV_TOKEN }} files: coverage.xml diff --git a/.github/workflows/test-integrations-dbs.yml b/.github/workflows/test-integrations-dbs.yml index ecb5bfdff8..390d579094 100644 --- a/.github/workflows/test-integrations-dbs.yml +++ b/.github/workflows/test-integrations-dbs.yml @@ -94,7 +94,7 @@ jobs: coverage xml - name: Upload coverage to Codecov if: ${{ !cancelled() }} - uses: codecov/codecov-action@v5.4.0 + uses: codecov/codecov-action@v5.4.2 with: token: ${{ secrets.CODECOV_TOKEN }} files: coverage.xml @@ -180,7 +180,7 @@ jobs: coverage xml - name: Upload coverage to Codecov if: ${{ !cancelled() }} - uses: codecov/codecov-action@v5.4.0 + uses: codecov/codecov-action@v5.4.2 with: token: ${{ secrets.CODECOV_TOKEN }} files: coverage.xml diff --git a/.github/workflows/test-integrations-flags.yml b/.github/workflows/test-integrations-flags.yml index cc4580cc22..ffcef6e799 100644 --- a/.github/workflows/test-integrations-flags.yml +++ b/.github/workflows/test-integrations-flags.yml @@ -66,7 +66,7 @@ jobs: coverage xml - name: Upload coverage to Codecov if: ${{ !cancelled() }} - uses: codecov/codecov-action@v5.4.0 + uses: codecov/codecov-action@v5.4.2 with: token: ${{ secrets.CODECOV_TOKEN }} files: coverage.xml diff --git a/.github/workflows/test-integrations-gevent.yml b/.github/workflows/test-integrations-gevent.yml index ee48fe4d95..76c70d8ac7 100644 --- a/.github/workflows/test-integrations-gevent.yml +++ b/.github/workflows/test-integrations-gevent.yml @@ -54,7 +54,7 @@ jobs: coverage xml - name: Upload coverage to Codecov if: ${{ !cancelled() }} - uses: codecov/codecov-action@v5.4.0 + uses: codecov/codecov-action@v5.4.2 with: token: ${{ secrets.CODECOV_TOKEN }} files: coverage.xml diff --git a/.github/workflows/test-integrations-graphql.yml b/.github/workflows/test-integrations-graphql.yml index 09890d7662..02ccf1804c 100644 --- a/.github/workflows/test-integrations-graphql.yml +++ b/.github/workflows/test-integrations-graphql.yml @@ -66,7 +66,7 @@ jobs: coverage xml - name: Upload coverage to Codecov if: ${{ !cancelled() }} - uses: codecov/codecov-action@v5.4.0 + uses: codecov/codecov-action@v5.4.2 with: token: ${{ secrets.CODECOV_TOKEN }} files: coverage.xml diff --git a/.github/workflows/test-integrations-misc.yml b/.github/workflows/test-integrations-misc.yml index 1f670f1ddd..6198241fb0 100644 --- a/.github/workflows/test-integrations-misc.yml +++ b/.github/workflows/test-integrations-misc.yml @@ -74,7 +74,7 @@ jobs: coverage xml - name: Upload coverage to Codecov if: ${{ !cancelled() }} - uses: codecov/codecov-action@v5.4.0 + uses: codecov/codecov-action@v5.4.2 with: token: ${{ secrets.CODECOV_TOKEN }} files: coverage.xml diff --git a/.github/workflows/test-integrations-network.yml b/.github/workflows/test-integrations-network.yml index c31f35758a..f7c2dc5ed7 100644 --- a/.github/workflows/test-integrations-network.yml +++ b/.github/workflows/test-integrations-network.yml @@ -62,7 +62,7 @@ jobs: coverage xml - name: Upload coverage to Codecov if: ${{ !cancelled() }} - uses: codecov/codecov-action@v5.4.0 + uses: codecov/codecov-action@v5.4.2 with: token: ${{ secrets.CODECOV_TOKEN }} files: coverage.xml @@ -116,7 +116,7 @@ jobs: coverage xml - name: Upload coverage to Codecov if: ${{ !cancelled() }} - uses: codecov/codecov-action@v5.4.0 + uses: codecov/codecov-action@v5.4.2 with: token: ${{ secrets.CODECOV_TOKEN }} files: coverage.xml diff --git a/.github/workflows/test-integrations-tasks.yml b/.github/workflows/test-integrations-tasks.yml index 3c80bd7146..6d4fdfeb6b 100644 --- a/.github/workflows/test-integrations-tasks.yml +++ b/.github/workflows/test-integrations-tasks.yml @@ -84,7 +84,7 @@ jobs: coverage xml - name: Upload coverage to Codecov if: ${{ !cancelled() }} - uses: codecov/codecov-action@v5.4.0 + uses: codecov/codecov-action@v5.4.2 with: token: ${{ secrets.CODECOV_TOKEN }} files: coverage.xml @@ -160,7 +160,7 @@ jobs: coverage xml - name: Upload coverage to Codecov if: ${{ !cancelled() }} - uses: codecov/codecov-action@v5.4.0 + uses: codecov/codecov-action@v5.4.2 with: token: ${{ secrets.CODECOV_TOKEN }} files: coverage.xml diff --git a/.github/workflows/test-integrations-web-1.yml b/.github/workflows/test-integrations-web-1.yml index 9377c1bae7..14188fb047 100644 --- a/.github/workflows/test-integrations-web-1.yml +++ b/.github/workflows/test-integrations-web-1.yml @@ -84,7 +84,7 @@ jobs: coverage xml - name: Upload coverage to Codecov if: ${{ !cancelled() }} - uses: codecov/codecov-action@v5.4.0 + uses: codecov/codecov-action@v5.4.2 with: token: ${{ secrets.CODECOV_TOKEN }} files: coverage.xml diff --git a/.github/workflows/test-integrations-web-2.yml b/.github/workflows/test-integrations-web-2.yml index 70bf07bdb5..624b46bf9a 100644 --- a/.github/workflows/test-integrations-web-2.yml +++ b/.github/workflows/test-integrations-web-2.yml @@ -90,7 +90,7 @@ jobs: coverage xml - name: Upload coverage to Codecov if: ${{ !cancelled() }} - uses: codecov/codecov-action@v5.4.0 + uses: codecov/codecov-action@v5.4.2 with: token: ${{ secrets.CODECOV_TOKEN }} files: coverage.xml @@ -172,7 +172,7 @@ jobs: coverage xml - name: Upload coverage to Codecov if: ${{ !cancelled() }} - uses: codecov/codecov-action@v5.4.0 + uses: codecov/codecov-action@v5.4.2 with: token: ${{ secrets.CODECOV_TOKEN }} files: coverage.xml diff --git a/CHANGELOG.md b/CHANGELOG.md index bb49ed54ca..786a9a34e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,24 @@ # Changelog +## 2.27.0 + +### Various fixes & improvements + +- fix: Make sure to use the default decimal context in our code (#4231) by @antonpirker +- fix(integrations): ASGI integration not capture transactions in Websocket (#4293) by @guodong000 +- feat(typing): Make all relevant types public (#4315) by @antonpirker +- feat(spans): Record flag evaluations as span attributes (#4280) by @cmanallen +- test(logs): Avoid failure when running with integrations enabled (#4316) by @rominf +- tests: Remove unused code and rerun (#4313) by @sentrivana +- tests: Add cohere to toxgen (#4304) by @sentrivana +- tests: Migrate fastapi to toxgen (#4302) by @sentrivana +- tests: Add huggingface_hub to toxgen (#4299) by @sentrivana +- tests: Add huey to toxgen (#4298) by @sentrivana +- tests: Update tox.ini (#4297) by @sentrivana +- tests: Move aiohttp under toxgen (#4319) by @sentrivana +- tests: Fix version picking in toxgen (#4323) by @sentrivana +- build(deps): bump codecov/codecov-action from 5.4.0 to 5.4.2 (#4318) by @dependabot + ## 2.26.1 ### Various fixes & improvements diff --git a/scripts/populate_tox/config.py b/scripts/populate_tox/config.py index 9019df4271..25867e20fa 100644 --- a/scripts/populate_tox/config.py +++ b/scripts/populate_tox/config.py @@ -6,6 +6,14 @@ # See scripts/populate_tox/README.md for more info on the format and examples. TEST_SUITE_CONFIG = { + "aiohttp": { + "package": "aiohttp", + "deps": { + "*": ["pytest-aiohttp"], + ">=3.8": ["pytest-asyncio"], + }, + "python": ">=3.7", + }, "ariadne": { "package": "ariadne", "deps": { diff --git a/scripts/populate_tox/populate_tox.py b/scripts/populate_tox/populate_tox.py index 5295480cd2..cb442083fd 100644 --- a/scripts/populate_tox/populate_tox.py +++ b/scripts/populate_tox/populate_tox.py @@ -66,7 +66,6 @@ "potel", # Integrations that can be migrated -- we should eventually remove all # of these from the IGNORE list - "aiohttp", "anthropic", "arq", "asyncpg", @@ -189,10 +188,10 @@ def _prefilter_releases( if ( version.major == saved_version.major and version.minor == saved_version.minor - and version.micro > saved_version.micro ): # Don't save all patch versions of a release, just the newest one - filtered_releases[i] = version + if version.micro > saved_version.micro: + filtered_releases[i] = version break else: filtered_releases.append(version) diff --git a/scripts/populate_tox/tox.jinja b/scripts/populate_tox/tox.jinja index 5ebb02827c..7a7332b3d3 100644 --- a/scripts/populate_tox/tox.jinja +++ b/scripts/populate_tox/tox.jinja @@ -33,11 +33,6 @@ envlist = # At a minimum, we should test against at least the lowest # and the latest supported version of a framework. - # AIOHTTP - {py3.7}-aiohttp-v{3.4} - {py3.7,py3.9,py3.11}-aiohttp-v{3.8} - {py3.8,py3.12,py3.13}-aiohttp-latest - # Anthropic {py3.8,py3.11,py3.12}-anthropic-v{0.16,0.28,0.40} {py3.7,py3.11,py3.12}-anthropic-latest @@ -165,14 +160,6 @@ deps = # === Integrations === - # AIOHTTP - aiohttp-v3.4: aiohttp~=3.4.0 - aiohttp-v3.8: aiohttp~=3.8.0 - aiohttp-latest: aiohttp - aiohttp: pytest-aiohttp - aiohttp-v3.8: pytest-asyncio - aiohttp-latest: pytest-asyncio - # Anthropic anthropic: pytest-asyncio anthropic-v{0.16,0.28}: httpx<0.28.0 diff --git a/scripts/split_tox_gh_actions/templates/test_group.jinja b/scripts/split_tox_gh_actions/templates/test_group.jinja index 01938ed6c6..cd2b45805b 100644 --- a/scripts/split_tox_gh_actions/templates/test_group.jinja +++ b/scripts/split_tox_gh_actions/templates/test_group.jinja @@ -77,7 +77,7 @@ - name: Upload coverage to Codecov if: {% raw %}${{ !cancelled() }}{% endraw %} - uses: codecov/codecov-action@v5.4.0 + uses: codecov/codecov-action@v5.4.2 with: token: {% raw %}${{ secrets.CODECOV_TOKEN }}{% endraw %} files: coverage.xml diff --git a/sentry_sdk/_types.py b/sentry_sdk/_types.py index 6fb057d1a7..9b320966ea 100644 --- a/sentry_sdk/_types.py +++ b/sentry_sdk/_types.py @@ -218,7 +218,9 @@ class SDKInfo(TypedDict): tuple[None, None, None], ] + # TODO: Make a proper type definition for this (PRs welcome!) Hint = Dict[str, Any] + Log = TypedDict( "Log", { @@ -231,9 +233,13 @@ class SDKInfo(TypedDict): }, ) + # TODO: Make a proper type definition for this (PRs welcome!) Breadcrumb = Dict[str, Any] + + # TODO: Make a proper type definition for this (PRs welcome!) BreadcrumbHint = Dict[str, Any] + # TODO: Make a proper type definition for this (PRs welcome!) SamplingContext = Dict[str, Any] EventProcessor = Callable[[Event, Hint], Optional[Event]] diff --git a/sentry_sdk/feature_flags.py b/sentry_sdk/feature_flags.py index a0b1338356..ea551edd20 100644 --- a/sentry_sdk/feature_flags.py +++ b/sentry_sdk/feature_flags.py @@ -66,3 +66,7 @@ def add_feature_flag(flag, result): """ flags = sentry_sdk.get_current_scope().flags flags.set(flag, result) + + span = sentry_sdk.get_current_span() + if span: + span.set_flag(flag, result) diff --git a/sentry_sdk/integrations/asgi.py b/sentry_sdk/integrations/asgi.py index c65ce5bed3..a8a5e46c8b 100644 --- a/sentry_sdk/integrations/asgi.py +++ b/sentry_sdk/integrations/asgi.py @@ -204,7 +204,9 @@ async def _run_app(self, scope, receive, send, asgi_version): ty = scope["type"] method = scope.get("method", "").upper() - should_trace = method in self.http_methods_to_capture + should_trace = ty == "websocket" or ( + ty == "http" and method in self.http_methods_to_capture + ) if not should_trace: return await self._run_original_app( scope, receive, send, asgi_version diff --git a/sentry_sdk/integrations/launchdarkly.py b/sentry_sdk/integrations/launchdarkly.py index cb9e911463..d3c423e7be 100644 --- a/sentry_sdk/integrations/launchdarkly.py +++ b/sentry_sdk/integrations/launchdarkly.py @@ -1,6 +1,6 @@ from typing import TYPE_CHECKING -import sentry_sdk +from sentry_sdk.feature_flags import add_feature_flag from sentry_sdk.integrations import DidNotEnable, Integration try: @@ -53,8 +53,8 @@ def metadata(self): def after_evaluation(self, series_context, data, detail): # type: (EvaluationSeriesContext, dict[Any, Any], EvaluationDetail) -> dict[Any, Any] if isinstance(detail.value, bool): - flags = sentry_sdk.get_current_scope().flags - flags.set(series_context.key, detail.value) + add_feature_flag(series_context.key, detail.value) + return data def before_evaluation(self, series_context, data): diff --git a/sentry_sdk/integrations/openfeature.py b/sentry_sdk/integrations/openfeature.py index bf66b94e8b..e2b33d83f2 100644 --- a/sentry_sdk/integrations/openfeature.py +++ b/sentry_sdk/integrations/openfeature.py @@ -1,6 +1,6 @@ from typing import TYPE_CHECKING -import sentry_sdk +from sentry_sdk.feature_flags import add_feature_flag from sentry_sdk.integrations import DidNotEnable, Integration try: @@ -29,11 +29,9 @@ class OpenFeatureHook(Hook): def after(self, hook_context, details, hints): # type: (HookContext, FlagEvaluationDetails[bool], HookHints) -> None if isinstance(details.value, bool): - flags = sentry_sdk.get_current_scope().flags - flags.set(details.flag_key, details.value) + add_feature_flag(details.flag_key, details.value) def error(self, hook_context, exception, hints): # type: (HookContext, Exception, HookHints) -> None if isinstance(hook_context.default_value, bool): - flags = sentry_sdk.get_current_scope().flags - flags.set(hook_context.flag_key, hook_context.default_value) + add_feature_flag(hook_context.flag_key, hook_context.default_value) diff --git a/sentry_sdk/integrations/unleash.py b/sentry_sdk/integrations/unleash.py index 873f36c68b..6daa0a411f 100644 --- a/sentry_sdk/integrations/unleash.py +++ b/sentry_sdk/integrations/unleash.py @@ -1,7 +1,7 @@ from functools import wraps from typing import Any -import sentry_sdk +from sentry_sdk.feature_flags import add_feature_flag from sentry_sdk.integrations import Integration, DidNotEnable try: @@ -26,8 +26,7 @@ def sentry_is_enabled(self, feature, *args, **kwargs): # We have no way of knowing what type of unleash feature this is, so we have to treat # it as a boolean / toggle feature. - flags = sentry_sdk.get_current_scope().flags - flags.set(feature, enabled) + add_feature_flag(feature, enabled) return enabled diff --git a/sentry_sdk/opentelemetry/sampler.py b/sentry_sdk/opentelemetry/sampler.py index 2afe26d95e..fb68b644b5 100644 --- a/sentry_sdk/opentelemetry/sampler.py +++ b/sentry_sdk/opentelemetry/sampler.py @@ -276,7 +276,7 @@ def should_sample( # Compare sample_rand to sample_rate to make the final sampling decision sample_rate = float(cast("Union[bool, float, int]", sample_rate)) - sampled = sample_rand < sample_rate + sampled = sample_rand < Decimal.from_float(sample_rate) if sampled: return sampled_result( diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py index a235448558..7b8004c8b5 100644 --- a/sentry_sdk/tracing.py +++ b/sentry_sdk/tracing.py @@ -71,7 +71,7 @@ from sentry_sdk.tracing_utils import Baggage - +_FLAGS_CAPACITY = 10 _OTEL_VERSION = parse_version(otel_version) tracer = otel_trace.get_tracer(__name__) @@ -598,6 +598,13 @@ def set_context(self, key, value): self.set_attribute(f"{SentrySpanAttribute.CONTEXT}.{key}", value) + def set_flag(self, flag, value): + # type: (str, bool) -> None + flag_count = self.get_attribute("flag.count") or 0 + if flag_count < _FLAGS_CAPACITY: + self.set_attribute(f"flag.evaluation.{flag}", value) + self.set_attribute("flag.count", flag_count + 1) + # TODO-neel-potel add deprecation Transaction = Span diff --git a/sentry_sdk/tracing_utils.py b/sentry_sdk/tracing_utils.py index c1d60cf269..a323b84199 100644 --- a/sentry_sdk/tracing_utils.py +++ b/sentry_sdk/tracing_utils.py @@ -7,7 +7,7 @@ import uuid from collections.abc import Mapping from datetime import datetime, timedelta, timezone -from decimal import ROUND_DOWN, Context, Decimal +from decimal import ROUND_DOWN, Decimal, DefaultContext, localcontext from functools import wraps from random import Random from urllib.parse import quote, unquote @@ -789,9 +789,15 @@ def _generate_sample_rand( while sample_rand >= upper: sample_rand = rng.uniform(lower, upper) - return Decimal(sample_rand).quantize( - Decimal("0.000001"), rounding=ROUND_DOWN, context=Context(prec=6) - ) + # Round down to exactly six decimal-digit precision. + # Setting the context is needed to avoid an InvalidOperation exception + # in case the user has changed the default precision or set traps. + with localcontext(DefaultContext) as ctx: + ctx.prec = 6 + return Decimal(sample_rand).quantize( + Decimal("0.000001"), + rounding=ROUND_DOWN, + ) def _sample_rand_range(parent_sampled, sample_rate): diff --git a/sentry_sdk/types.py b/sentry_sdk/types.py index 2b9f04c097..1a65247584 100644 --- a/sentry_sdk/types.py +++ b/sentry_sdk/types.py @@ -11,15 +11,39 @@ from typing import TYPE_CHECKING if TYPE_CHECKING: - from sentry_sdk._types import Event, EventDataCategory, Hint, Log + # Re-export types to make them available in the public API + from sentry_sdk._types import ( + Breadcrumb, + BreadcrumbHint, + Event, + EventDataCategory, + Hint, + Log, + MonitorConfig, + SamplingContext, + ) else: from typing import Any # The lines below allow the types to be imported from outside `if TYPE_CHECKING` # guards. The types in this module are only intended to be used for type hints. + Breadcrumb = Any + BreadcrumbHint = Any Event = Any EventDataCategory = Any Hint = Any Log = Any + MonitorConfig = Any + SamplingContext = Any -__all__ = ("Event", "EventDataCategory", "Hint", "Log") + +__all__ = ( + "Breadcrumb", + "BreadcrumbHint", + "Event", + "EventDataCategory", + "Hint", + "Log", + "MonitorConfig", + "SamplingContext", +) diff --git a/tests/integrations/aiohttp/test_aiohttp.py b/tests/integrations/aiohttp/test_aiohttp.py index 539216e0d6..8e0c74f365 100644 --- a/tests/integrations/aiohttp/test_aiohttp.py +++ b/tests/integrations/aiohttp/test_aiohttp.py @@ -1,11 +1,16 @@ import asyncio import json import re -import sys from contextlib import suppress from unittest import mock import pytest + +try: + import pytest_asyncio +except ImportError: + pytest_asyncio = None + from aiohttp import web, ClientSession from aiohttp.client import ServerDisconnectedError from aiohttp.web_exceptions import ( @@ -21,6 +26,14 @@ from tests.conftest import ApproxDict +if pytest_asyncio is None: + # `loop` was deprecated in `pytest-aiohttp` + # in favor of `event_loop` from `pytest-asyncio` + @pytest.fixture + def event_loop(loop): + yield loop + + @pytest.mark.asyncio async def test_basic(sentry_init, aiohttp_client, capture_events): sentry_init(integrations=[AioHttpIntegration()]) @@ -483,14 +496,6 @@ async def hello(request): assert error_event["contexts"]["trace"]["trace_id"] == trace_id -if sys.version_info < (3, 12): - # `loop` was deprecated in `pytest-aiohttp` - # in favor of `event_loop` from `pytest-asyncio` - @pytest.fixture - def event_loop(loop): - yield loop - - @pytest.mark.asyncio async def test_crumb_capture( sentry_init, aiohttp_raw_server, aiohttp_client, event_loop, capture_events diff --git a/tests/integrations/asgi/test_asgi.py b/tests/integrations/asgi/test_asgi.py index 6651642436..f14e960fff 100644 --- a/tests/integrations/asgi/test_asgi.py +++ b/tests/integrations/asgi/test_asgi.py @@ -353,35 +353,32 @@ async def test_trace_from_headers_if_performance_disabled( @pytest.mark.asyncio async def test_websocket(sentry_init, asgi3_ws_app, capture_events, request): - sentry_init(send_default_pii=True) + sentry_init(send_default_pii=True, traces_sample_rate=1.0) events = capture_events() asgi3_ws_app = SentryAsgiMiddleware(asgi3_ws_app) - scope = { - "type": "websocket", - "endpoint": asgi3_app, - "client": ("127.0.0.1", 60457), - "route": "some_url", - "headers": [ - ("accept", "*/*"), - ], - } + request_url = "/ws" with pytest.raises(ValueError): - async with TestClient(asgi3_ws_app, scope=scope) as client: - async with client.websocket_connect("/ws") as ws: - await ws.receive_text() + client = TestClient(asgi3_ws_app) + async with client.websocket_connect(request_url) as ws: + await ws.receive_text() - msg_event, error_event = events + msg_event, error_event, transaction_event = events + assert msg_event["transaction"] == request_url + assert msg_event["transaction_info"] == {"source": "url"} assert msg_event["message"] == "Some message to the world!" (exc,) = error_event["exception"]["values"] assert exc["type"] == "ValueError" assert exc["value"] == "Oh no" + assert transaction_event["transaction"] == request_url + assert transaction_event["transaction_info"] == {"source": "url"} + @pytest.mark.asyncio async def test_auto_session_tracking_with_aggregates( diff --git a/tests/integrations/launchdarkly/test_launchdarkly.py b/tests/integrations/launchdarkly/test_launchdarkly.py index 20566ce09a..20bb4d031f 100644 --- a/tests/integrations/launchdarkly/test_launchdarkly.py +++ b/tests/integrations/launchdarkly/test_launchdarkly.py @@ -12,6 +12,8 @@ import sentry_sdk from sentry_sdk.integrations import DidNotEnable from sentry_sdk.integrations.launchdarkly import LaunchDarklyIntegration +from sentry_sdk import start_span, start_transaction +from tests.conftest import ApproxDict @pytest.mark.parametrize( @@ -202,3 +204,42 @@ def test_launchdarkly_integration_did_not_enable(monkeypatch): monkeypatch.setattr(client, "is_initialized", lambda: False) with pytest.raises(DidNotEnable): LaunchDarklyIntegration(ld_client=client) + + +@pytest.mark.parametrize( + "use_global_client", + (False, True), +) +def test_launchdarkly_span_integration( + sentry_init, use_global_client, capture_events, uninstall_integration +): + td = TestData.data_source() + td.update(td.flag("hello").variation_for_all(True)) + # Disable background requests as we aren't using a server. + config = Config( + "sdk-key", update_processor_class=td, diagnostic_opt_out=True, send_events=False + ) + + uninstall_integration(LaunchDarklyIntegration.identifier) + if use_global_client: + ldclient.set_config(config) + sentry_init(traces_sample_rate=1.0, integrations=[LaunchDarklyIntegration()]) + client = ldclient.get() + else: + client = LDClient(config=config) + sentry_init( + traces_sample_rate=1.0, + integrations=[LaunchDarklyIntegration(ld_client=client)], + ) + + events = capture_events() + + with start_transaction(name="hi"): + with start_span(op="foo", name="bar"): + client.variation("hello", Context.create("my-org", "organization"), False) + client.variation("other", Context.create("my-org", "organization"), False) + + (event,) = events + assert event["spans"][0]["data"] == ApproxDict( + {"flag.evaluation.hello": True, "flag.evaluation.other": False} + ) diff --git a/tests/integrations/openfeature/test_openfeature.py b/tests/integrations/openfeature/test_openfeature.py index c180211c3f..46acc61ae7 100644 --- a/tests/integrations/openfeature/test_openfeature.py +++ b/tests/integrations/openfeature/test_openfeature.py @@ -7,7 +7,9 @@ from openfeature.provider.in_memory_provider import InMemoryFlag, InMemoryProvider import sentry_sdk +from sentry_sdk import start_span, start_transaction from sentry_sdk.integrations.openfeature import OpenFeatureIntegration +from tests.conftest import ApproxDict def test_openfeature_integration(sentry_init, capture_events, uninstall_integration): @@ -151,3 +153,27 @@ async def runner(): {"flag": "world", "result": False}, ] } + + +def test_openfeature_span_integration( + sentry_init, capture_events, uninstall_integration +): + uninstall_integration(OpenFeatureIntegration.identifier) + sentry_init(traces_sample_rate=1.0, integrations=[OpenFeatureIntegration()]) + + api.set_provider( + InMemoryProvider({"hello": InMemoryFlag("on", {"on": True, "off": False})}) + ) + client = api.get_client() + + events = capture_events() + + with start_transaction(name="hi"): + with start_span(op="foo", name="bar"): + client.get_boolean_value("hello", default_value=False) + client.get_boolean_value("world", default_value=False) + + (event,) = events + assert event["spans"][0]["data"] == ApproxDict( + {"flag.evaluation.hello": True, "flag.evaluation.world": False} + ) diff --git a/tests/integrations/statsig/test_statsig.py b/tests/integrations/statsig/test_statsig.py index c1666bde4d..5eb2cf39f3 100644 --- a/tests/integrations/statsig/test_statsig.py +++ b/tests/integrations/statsig/test_statsig.py @@ -5,6 +5,8 @@ from statsig.statsig_user import StatsigUser from random import random from unittest.mock import Mock +from sentry_sdk import start_span, start_transaction +from tests.conftest import ApproxDict import pytest @@ -181,3 +183,21 @@ def test_wrapper_attributes(sentry_init, uninstall_integration): # Clean up statsig.check_gate = original_check_gate + + +def test_statsig_span_integration(sentry_init, capture_events, uninstall_integration): + uninstall_integration(StatsigIntegration.identifier) + + with mock_statsig({"hello": True}): + sentry_init(traces_sample_rate=1.0, integrations=[StatsigIntegration()]) + events = capture_events() + user = StatsigUser(user_id="user-id") + with start_transaction(name="hi"): + with start_span(op="foo", name="bar"): + statsig.check_gate(user, "hello") + statsig.check_gate(user, "world") + + (event,) = events + assert event["spans"][0]["data"] == ApproxDict( + {"flag.evaluation.hello": True, "flag.evaluation.world": False} + ) diff --git a/tests/integrations/unleash/test_unleash.py b/tests/integrations/unleash/test_unleash.py index 379abba8f6..98a6188181 100644 --- a/tests/integrations/unleash/test_unleash.py +++ b/tests/integrations/unleash/test_unleash.py @@ -8,7 +8,9 @@ import sentry_sdk from sentry_sdk.integrations.unleash import UnleashIntegration +from sentry_sdk import start_span, start_transaction from tests.integrations.unleash.testutils import mock_unleash_client +from tests.conftest import ApproxDict def test_is_enabled(sentry_init, capture_events, uninstall_integration): @@ -164,3 +166,21 @@ def test_wrapper_attributes(sentry_init, uninstall_integration): # Mock clients methods have not lost their qualified names after decoration. assert client.is_enabled.__name__ == "is_enabled" assert client.is_enabled.__qualname__ == original_is_enabled.__qualname__ + + +def test_unleash_span_integration(sentry_init, capture_events, uninstall_integration): + uninstall_integration(UnleashIntegration.identifier) + + with mock_unleash_client(): + sentry_init(traces_sample_rate=1.0, integrations=[UnleashIntegration()]) + events = capture_events() + client = UnleashClient() # type: ignore[arg-type] + with start_transaction(name="hi"): + with start_span(op="foo", name="bar"): + client.is_enabled("hello") + client.is_enabled("other") + + (event,) = events + assert event["spans"][0]["data"] == ApproxDict( + {"flag.evaluation.hello": True, "flag.evaluation.other": False} + ) diff --git a/tests/test_feature_flags.py b/tests/test_feature_flags.py index 0df30bd0ea..1b0ed13d49 100644 --- a/tests/test_feature_flags.py +++ b/tests/test_feature_flags.py @@ -7,6 +7,8 @@ import sentry_sdk from sentry_sdk.feature_flags import add_feature_flag, FlagBuffer +from sentry_sdk import start_span, start_transaction +from tests.conftest import ApproxDict def test_featureflags_integration(sentry_init, capture_events, uninstall_integration): @@ -220,3 +222,40 @@ def reader(): # shared resource. When deepcopying we should have exclusive access to the underlying # memory. assert error_occurred is False + + +def test_flag_limit(sentry_init, capture_events): + sentry_init(traces_sample_rate=1.0) + + events = capture_events() + + with start_transaction(name="hi"): + with start_span(op="foo", name="bar"): + add_feature_flag("0", True) + add_feature_flag("1", True) + add_feature_flag("2", True) + add_feature_flag("3", True) + add_feature_flag("4", True) + add_feature_flag("5", True) + add_feature_flag("6", True) + add_feature_flag("7", True) + add_feature_flag("8", True) + add_feature_flag("9", True) + add_feature_flag("10", True) + + (event,) = events + assert event["spans"][0]["data"] == ApproxDict( + { + "flag.evaluation.0": True, + "flag.evaluation.1": True, + "flag.evaluation.2": True, + "flag.evaluation.3": True, + "flag.evaluation.4": True, + "flag.evaluation.5": True, + "flag.evaluation.6": True, + "flag.evaluation.7": True, + "flag.evaluation.8": True, + "flag.evaluation.9": True, + } + ) + assert "flag.evaluation.10" not in event["spans"][0]["data"] diff --git a/tests/test_logs.py b/tests/test_logs.py index 584fdcc608..5aa5e9c893 100644 --- a/tests/test_logs.py +++ b/tests/test_logs.py @@ -186,7 +186,7 @@ def test_logs_attributes(sentry_init, capture_envelopes): assert "sentry.release" in logs[0]["attributes"] assert logs[0]["attributes"]["sentry.message.parameters.my_var"] == "some value" assert logs[0]["attributes"][SPANDATA.SERVER_ADDRESS] == "test-server" - assert logs[0]["attributes"]["sentry.sdk.name"] == "sentry.python" + assert logs[0]["attributes"]["sentry.sdk.name"].startswith("sentry.python") assert logs[0]["attributes"]["sentry.sdk.version"] == VERSION diff --git a/tests/tracing/test_sample_rand.py b/tests/tracing/test_sample_rand.py index 38a0fe05a2..fe9f61716d 100644 --- a/tests/tracing/test_sample_rand.py +++ b/tests/tracing/test_sample_rand.py @@ -1,4 +1,5 @@ import decimal +from decimal import Inexact, FloatOperation from unittest import mock import pytest @@ -62,14 +63,19 @@ def test_transaction_uses_incoming_sample_rand( def test_decimal_context(sentry_init, capture_events): """ - Ensure that having a decimal context with a precision below 6 + Ensure that having a user altered decimal context with a precision below 6 does not cause an InvalidOperation exception. """ sentry_init(traces_sample_rate=1.0) events = capture_events() old_prec = decimal.getcontext().prec + old_inexact = decimal.getcontext().traps[Inexact] + old_float_operation = decimal.getcontext().traps[FloatOperation] + decimal.getcontext().prec = 2 + decimal.getcontext().traps[Inexact] = True + decimal.getcontext().traps[FloatOperation] = True try: with mock.patch( @@ -79,6 +85,8 @@ def test_decimal_context(sentry_init, capture_events): assert root_span.get_baggage().sentry_items["sample_rand"] == "0.123456" finally: decimal.getcontext().prec = old_prec + decimal.getcontext().traps[Inexact] = old_inexact + decimal.getcontext().traps[FloatOperation] = old_float_operation assert len(events) == 1 diff --git a/tox.ini b/tox.ini index 53c37ca47e..a3d19dfe81 100644 --- a/tox.ini +++ b/tox.ini @@ -10,7 +10,7 @@ # The file (and all resulting CI YAMLs) then need to be regenerated via # "scripts/generate-test-files.sh". # -# Last generated: 2025-04-17T12:20:33.943833+00:00 +# Last generated: 2025-04-24T13:53:43.329047+00:00 [tox] requires = @@ -33,11 +33,6 @@ envlist = # At a minimum, we should test against at least the lowest # and the latest supported version of a framework. - # AIOHTTP - {py3.7}-aiohttp-v{3.4} - {py3.7,py3.9,py3.11}-aiohttp-v{3.8} - {py3.8,py3.12,py3.13}-aiohttp-latest - # Anthropic {py3.8,py3.11,py3.12}-anthropic-v{0.16,0.28,0.40} {py3.7,py3.11,py3.12}-anthropic-latest @@ -142,8 +137,8 @@ envlist = # ~~~ AI ~~~ {py3.9,py3.10,py3.11}-cohere-v5.4.0 - {py3.9,py3.11,py3.12}-cohere-v5.9.4 - {py3.9,py3.11,py3.12}-cohere-v5.13.9 + {py3.9,py3.11,py3.12}-cohere-v5.8.1 + {py3.9,py3.11,py3.12}-cohere-v5.11.4 {py3.9,py3.11,py3.12}-cohere-v5.15.0 {py3.8,py3.10,py3.11}-huggingface_hub-v0.22.2 @@ -163,9 +158,8 @@ envlist = {py3.7}-redis_py_cluster_legacy-v2.0.0 {py3.7,py3.8}-redis_py_cluster_legacy-v2.1.3 - {py3.7}-sqlalchemy-v1.3.9 + {py3.7,py3.8,py3.9}-sqlalchemy-v1.3.24 {py3.7,py3.11,py3.12}-sqlalchemy-v1.4.54 - {py3.7,py3.10,py3.11}-sqlalchemy-v2.0.9 {py3.7,py3.12,py3.13}-sqlalchemy-v2.0.40 @@ -191,7 +185,7 @@ envlist = {py3.8,py3.10,py3.11}-ariadne-v0.20.1 {py3.8,py3.11,py3.12}-ariadne-v0.22 {py3.8,py3.11,py3.12}-ariadne-v0.24.0 - {py3.9,py3.12,py3.13}-ariadne-v0.26.1 + {py3.9,py3.12,py3.13}-ariadne-v0.26.2 {py3.7,py3.9,py3.10}-gql-v3.4.1 {py3.7,py3.11,py3.12}-gql-v3.5.2 @@ -203,7 +197,7 @@ envlist = {py3.8,py3.10,py3.11}-strawberry-v0.209.8 {py3.8,py3.11,py3.12}-strawberry-v0.228.0 {py3.8,py3.12,py3.13}-strawberry-v0.247.2 - {py3.9,py3.12,py3.13}-strawberry-v0.265.1 + {py3.9,py3.12,py3.13}-strawberry-v0.266.0 # ~~~ Network ~~~ @@ -236,11 +230,11 @@ envlist = # ~~~ Web 1 ~~~ - {py3.7}-django-v2.0.9 + {py3.7}-django-v2.0.13 {py3.7,py3.8,py3.9}-django-v2.2.28 {py3.7,py3.9,py3.10}-django-v3.2.25 {py3.8,py3.11,py3.12}-django-v4.2.20 - {py3.10,py3.11,py3.12}-django-v5.0.9 + {py3.10,py3.11,py3.12}-django-v5.0.14 {py3.10,py3.12,py3.13}-django-v5.2 {py3.7,py3.8}-flask-v1.1.4 @@ -260,8 +254,13 @@ envlist = # ~~~ Web 2 ~~~ + {py3.7}-aiohttp-v3.4.4 + {py3.7}-aiohttp-v3.6.3 + {py3.7,py3.9,py3.10}-aiohttp-v3.8.6 + {py3.9,py3.12,py3.13}-aiohttp-v3.11.18 + {py3.7}-bottle-v0.12.25 - {py3.7,py3.8,py3.9}-bottle-v0.13.2 + {py3.8,py3.12,py3.13}-bottle-v0.13.3 {py3.7,py3.8,py3.9}-falcon-v3.0.1 {py3.7,py3.11,py3.12}-falcon-v3.1.3 @@ -289,10 +288,10 @@ envlist = # ~~~ Misc ~~~ {py3.7,py3.12,py3.13}-loguru-v0.7.3 - {py3.7}-trytond-v5.0.9 + {py3.7}-trytond-v5.0.63 {py3.7,py3.8}-trytond-v5.8.16 {py3.8,py3.10,py3.11}-trytond-v6.8.17 - {py3.8,py3.11,py3.12}-trytond-v7.0.9 + {py3.8,py3.11,py3.12}-trytond-v7.0.29 {py3.8,py3.11,py3.12}-trytond-v7.4.9 {py3.7,py3.12,py3.13}-typer-v0.15.2 @@ -320,14 +319,6 @@ deps = # === Integrations === - # AIOHTTP - aiohttp-v3.4: aiohttp~=3.4.0 - aiohttp-v3.8: aiohttp~=3.8.0 - aiohttp-latest: aiohttp - aiohttp: pytest-aiohttp - aiohttp-v3.8: pytest-asyncio - aiohttp-latest: pytest-asyncio - # Anthropic anthropic: pytest-asyncio anthropic-v{0.16,0.28}: httpx<0.28.0 @@ -502,8 +493,8 @@ deps = # ~~~ AI ~~~ cohere-v5.4.0: cohere==5.4.0 - cohere-v5.9.4: cohere==5.9.4 - cohere-v5.13.9: cohere==5.13.9 + cohere-v5.8.1: cohere==5.8.1 + cohere-v5.11.4: cohere==5.11.4 cohere-v5.15.0: cohere==5.15.0 huggingface_hub-v0.22.2: huggingface_hub==0.22.2 @@ -524,9 +515,8 @@ deps = redis_py_cluster_legacy-v2.0.0: redis-py-cluster==2.0.0 redis_py_cluster_legacy-v2.1.3: redis-py-cluster==2.1.3 - sqlalchemy-v1.3.9: sqlalchemy==1.3.9 + sqlalchemy-v1.3.24: sqlalchemy==1.3.24 sqlalchemy-v1.4.54: sqlalchemy==1.4.54 - sqlalchemy-v2.0.9: sqlalchemy==2.0.9 sqlalchemy-v2.0.40: sqlalchemy==2.0.40 @@ -553,7 +543,7 @@ deps = ariadne-v0.20.1: ariadne==0.20.1 ariadne-v0.22: ariadne==0.22 ariadne-v0.24.0: ariadne==0.24.0 - ariadne-v0.26.1: ariadne==0.26.1 + ariadne-v0.26.2: ariadne==0.26.2 ariadne: fastapi ariadne: flask ariadne: httpx @@ -573,7 +563,7 @@ deps = strawberry-v0.209.8: strawberry-graphql[fastapi,flask]==0.209.8 strawberry-v0.228.0: strawberry-graphql[fastapi,flask]==0.228.0 strawberry-v0.247.2: strawberry-graphql[fastapi,flask]==0.247.2 - strawberry-v0.265.1: strawberry-graphql[fastapi,flask]==0.265.1 + strawberry-v0.266.0: strawberry-graphql[fastapi,flask]==0.266.0 strawberry: httpx strawberry-v0.209.8: pydantic<2.11 strawberry-v0.228.0: pydantic<2.11 @@ -616,11 +606,11 @@ deps = # ~~~ Web 1 ~~~ - django-v2.0.9: django==2.0.9 + django-v2.0.13: django==2.0.13 django-v2.2.28: django==2.2.28 django-v3.2.25: django==3.2.25 django-v4.2.20: django==4.2.20 - django-v5.0.9: django==5.0.9 + django-v5.0.14: django==5.0.14 django-v5.2: django==5.2 django: channels[daphne] django: psycopg2-binary @@ -629,16 +619,16 @@ deps = django: Werkzeug django-v3.2.25: pytest-asyncio django-v4.2.20: pytest-asyncio - django-v5.0.9: pytest-asyncio + django-v5.0.14: pytest-asyncio django-v5.2: pytest-asyncio django-v2.2.28: six - django-v2.0.9: djangorestframework>=3.0,<4.0 - django-v2.0.9: Werkzeug<2.1.0 + django-v2.0.13: djangorestframework>=3.0,<4.0 + django-v2.0.13: Werkzeug<2.1.0 django-v2.2.28: djangorestframework>=3.0,<4.0 django-v2.2.28: Werkzeug<2.1.0 django-v3.2.25: djangorestframework>=3.0,<4.0 django-v3.2.25: Werkzeug<2.1.0 - django-v2.0.9: pytest-django<4.0 + django-v2.0.13: pytest-django<4.0 django-v2.2.28: pytest-django<4.0 flask-v1.1.4: flask==1.1.4 @@ -681,8 +671,16 @@ deps = # ~~~ Web 2 ~~~ + aiohttp-v3.4.4: aiohttp==3.4.4 + aiohttp-v3.6.3: aiohttp==3.6.3 + aiohttp-v3.8.6: aiohttp==3.8.6 + aiohttp-v3.11.18: aiohttp==3.11.18 + aiohttp: pytest-aiohttp + aiohttp-v3.8.6: pytest-asyncio + aiohttp-v3.11.18: pytest-asyncio + bottle-v0.12.25: bottle==0.12.25 - bottle-v0.13.2: bottle==0.13.2 + bottle-v0.13.3: bottle==0.13.3 bottle: werkzeug<2.1.0 falcon-v3.0.1: falcon==3.0.1 @@ -729,13 +727,13 @@ deps = # ~~~ Misc ~~~ loguru-v0.7.3: loguru==0.7.3 - trytond-v5.0.9: trytond==5.0.9 + trytond-v5.0.63: trytond==5.0.63 trytond-v5.8.16: trytond==5.8.16 trytond-v6.8.17: trytond==6.8.17 - trytond-v7.0.9: trytond==7.0.9 + trytond-v7.0.29: trytond==7.0.29 trytond-v7.4.9: trytond==7.4.9 trytond: werkzeug - trytond-v5.0.9: werkzeug<1.0 + trytond-v5.0.63: werkzeug<1.0 typer-v0.15.2: typer==0.15.2