Skip to content

[do not merge] Run CI on merge commit - #7571

Merged
sentrivana merged 13 commits into
major/3.0from
ivana/major/try-merge-2
Sep 22, 2026
Merged

sentrivana merged 13 commits into
major/3.0from
ivana/major/try-merge-2

Conversation

@sentrivana

@sentrivana sentrivana commented Sep 22, 2026 •

Copy link
Copy Markdown
Collaborator

Big merge. Verify that nothing broke.

…e_async` patches (#7528)

Add a `mistralai` integration, the `mistral` tox environment, and `mistralai` to the uv typing group.

Only handle synchronous responses (there is an early return for streaming requests).

Set the `gen_ai.provider.name`, `gen_ai.operation.name`, `gen_ai.request.model`, and `gen_ai.response.streaming` attributes.
Record `gen_ai.usage.input_tokens`, `gen_ai.usage.output_tokens`, and `gen_ai.usage.total_tokens` attributes.
Record `gen_ai.request.max_tokens`, `gen_ai.request.frequency_penalty`, `gen_ai.request.presence_penalty`, `gen_ai.request.temperature`, `gen_ai.request.top_p`, and `gen_ai.request.reasoning.level` attributes.
Handle `SystemMessage` Pydantic objects and dictionaries, recording text-type content.
Handle `SystemMessage` and `AssistantMessage` Pydantic objects, as well as dictionaries, recording text-type content.
Handle `AssistantMessage` Pydantic objects and dictionaries, recording text-type content.
Resolve test flake involving import race by closing old clients (preventing dangling threads).
… top-level (#7560)

Make `data_collection` available as a documented top-level
`sentry_sdk.init()` option. Update `has_data_collection_enabled` to
check `provided_by_user` on the resolved dict instead of key presence
under `_experiments`, and update all integration tests to pass
`data_collection` at the top level.

Fixes PY-2796
Fixes #7557

---------

Co-authored-by: Ivana Kellyer <ivana.kellyer@sentry.io>
@sentrivana sentrivana changed the title Ivana/major/try merge 2 [do not merge] Run CI on merge commit Sep 22, 2026
@sentrivana
sentrivana force-pushed the ivana/major/try-merge-2 branch 3 times, most recently from 058f6fb to dbabf3e Compare September 22, 2026 10:49
@sentrivana
sentrivana force-pushed the ivana/major/try-merge-2 branch from dbabf3e to 35f70d2 Compare September 22, 2026 10:56
@sentrivana
sentrivana merged commit 35f70d2 into major/3.0 Sep 22, 2026
143 of 144 checks passed
@sentrivana
sentrivana deleted the ivana/major/try-merge-2 branch September 22, 2026 11:03
@github-actions

Copy link
Copy Markdown
Contributor

Codecov Results 📊

✅ 66913 passed | ❌ 1 failed | ⏭️ 3019 skipped | Total: 69933 | Pass Rate: 95.68% | Execution Time: 190m 39s

📊 Comparison with Base Branch

Metric Change
Total Tests 📉 -66593
Passed Tests 📉 -62465
Failed Tests 📈 +1
Skipped Tests 📉 -4129

➕ New Tests (1)

View new tests
  • test_input_attributes_nonstreaming_chat[True-messages0-expected_system_instructions0-expected_input_messages0]
    • File: tests.integrations.mistral.test_mistral
    • Status: ❌ Failing

❌ Failed Tests

test_input_attributes_nonstreaming_chat[True-messages0-expected_system_instructions0-expected_input_messages0]

File: tests.integrations.mistral.test_mistral
Suite: py3.10-mistral-v2.0.5
Error: KeyError: 139916134285312

Stack Trace
tests/integrations/mistral/test_mistral.py:380: in test_input_attributes_nonstreaming_chat
    sentry_init(
tests/conftest.py:349: in inner
    client = sentry_sdk.Client(*a, **kw)
sentry_sdk/client.py:278: in __init__
    self._init_impl()
sentry_sdk/client.py:428: in _init_impl
    self.integrations = setup_integrations(
sentry_sdk/integrations/__init__.py:216: in setup_integrations
    for integration_cls in iter_default_integrations(
sentry_sdk/integrations/__init__.py:44: in iter_default_integrations
    yield getattr(import_module(module), cls)
/usr/lib/python3.10/importlib/__init__.py:126: in import_module
    return _bootstrap._gcd_import(name[level:], package, level)
<frozen importlib._bootstrap>:1050: in _gcd_import
    ???
<frozen importlib._bootstrap>:1024: in _find_and_load
    ???
<frozen importlib._bootstrap>:171: in __enter__
    ???
<frozen importlib._bootstrap>:123: in acquire
    ???
E   KeyError: 139916134285312

✅ Patch coverage is 91.47%. Project has 2089 uncovered lines.
❌ Project coverage is 90.13%. Comparing base (7494245) to head (35f70d2).

Files with missing lines (1)
File Patch % Lines
sentry_sdk/integrations/mistral.py 91.22% ⚠️ 18 Missing and 20 partials
Coverage diff
@@            Coverage Diff             @@
##        master       #PR       +/-##
==========================================
- Coverage    90.20%    90.13%    -0.07%
==========================================
  Files          194       180       -14
  Lines        25997     21155     -4842
  Branches      9662      7656     -2006
==========================================
+ Hits         23448     19066     -4382
- Misses        2549      2089      -460
- Partials      1450      1200      -250

Generated by Codecov Action

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants