Skip to content

Commit 01835ed

Browse files
sentrivanasentrivana
committed
Merge branch 'potel-base' into ivana/potel/start-span
2 parents cb6b686 + bd36b0d commit 01835ed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1788
-1242
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,6 @@
22

33
---
44

5-
## General Notes
5+
Thank you for contributing to `sentry-python`! Please add tests to validate your changes, and lint your code using `tox -e linters`.
66

7-
Thank you for contributing to `sentry-python`!
8-
9-
Please add tests to validate your changes, and lint your code using `tox -e linters`.
10-
11-
Running the test suite on your PR might require maintainer approval. Some tests (AWS Lambda) additionally require a maintainer to add a special label to run and will fail if the label is not present.
12-
13-
#### For maintainers
14-
15-
Sensitive test suites require maintainer review to ensure that tests do not compromise our secrets. This review must be repeated after any code revisions.
16-
17-
Before running sensitive test suites, please carefully check the PR. Then, apply the `Trigger: tests using secrets` label. The label will be removed after any code changes to enforce our policy requiring maintainers to review all code revisions before running sensitive tests.
7+
Running the test suite on your PR might require maintainer approval. The AWS Lambda tests additionally require a maintainer to add a special label, and they will fail until this label is added.

‎.github/workflows/test-integrations-ai.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Do not edit this file. This file is generated automatically by executing
2+
# python scripts/split-tox-gh-actions/split-tox-gh-actions.py
13
name: Test AI
24
on:
35
push:

‎.github/workflows/test-integrations-aws-lambda.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Do not edit this file. This file is generated automatically by executing
2+
# python scripts/split-tox-gh-actions/split-tox-gh-actions.py
13
name: Test AWS Lambda
24
on:
35
push:

‎.github/workflows/test-integrations-cloud-computing.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Do not edit this file. This file is generated automatically by executing
2+
# python scripts/split-tox-gh-actions/split-tox-gh-actions.py
13
name: Test Cloud Computing
24
on:
35
push:

‎.github/workflows/test-integrations-common.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Do not edit this file. This file is generated automatically by executing
2+
# python scripts/split-tox-gh-actions/split-tox-gh-actions.py
13
name: Test Common
24
on:
35
push:

‎.github/workflows/test-integrations-data-processing.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Do not edit this file. This file is generated automatically by executing
2+
# python scripts/split-tox-gh-actions/split-tox-gh-actions.py
13
name: Test Data Processing
24
on:
35
push:
@@ -57,6 +59,10 @@ jobs:
5759
run: |
5860
set -x # print commands that are executed
5961
./scripts/runtox.sh "py${{ matrix.python-version }}-celery-latest"
62+
- name: Test dramatiq latest
63+
run: |
64+
set -x # print commands that are executed
65+
./scripts/runtox.sh "py${{ matrix.python-version }}-dramatiq-latest"
6066
- name: Test huey latest
6167
run: |
6268
set -x # print commands that are executed
@@ -125,6 +131,10 @@ jobs:
125131
run: |
126132
set -x # print commands that are executed
127133
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-celery"
134+
- name: Test dramatiq pinned
135+
run: |
136+
set -x # print commands that are executed
137+
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-dramatiq"
128138
- name: Test huey pinned
129139
run: |
130140
set -x # print commands that are executed

‎.github/workflows/test-integrations-databases.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Do not edit this file. This file is generated automatically by executing
2+
# python scripts/split-tox-gh-actions/split-tox-gh-actions.py
13
name: Test Databases
24
on:
35
push:

‎.github/workflows/test-integrations-graphql.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Do not edit this file. This file is generated automatically by executing
2+
# python scripts/split-tox-gh-actions/split-tox-gh-actions.py
13
name: Test GraphQL
24
on:
35
push:

‎.github/workflows/test-integrations-miscellaneous.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Do not edit this file. This file is generated automatically by executing
2+
# python scripts/split-tox-gh-actions/split-tox-gh-actions.py
13
name: Test Miscellaneous
24
on:
35
push:

‎.github/workflows/test-integrations-networking.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Do not edit this file. This file is generated automatically by executing
2+
# python scripts/split-tox-gh-actions/split-tox-gh-actions.py
13
name: Test Networking
24
on:
35
push:

‎.github/workflows/test-integrations-web-frameworks-1.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Do not edit this file. This file is generated automatically by executing
2+
# python scripts/split-tox-gh-actions/split-tox-gh-actions.py
13
name: Test Web Frameworks 1
24
on:
35
push:

‎.github/workflows/test-integrations-web-frameworks-2.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Do not edit this file. This file is generated automatically by executing
2+
# python scripts/split-tox-gh-actions/split-tox-gh-actions.py
13
name: Test Web Frameworks 2
24
on:
35
push:
@@ -59,6 +61,10 @@ jobs:
5961
run: |
6062
set -x # print commands that are executed
6163
./scripts/runtox.sh "py${{ matrix.python-version }}-falcon-latest"
64+
- name: Test litestar latest
65+
run: |
66+
set -x # print commands that are executed
67+
./scripts/runtox.sh "py${{ matrix.python-version }}-litestar-latest"
6268
- name: Test pyramid latest
6369
run: |
6470
set -x # print commands that are executed
@@ -137,6 +143,10 @@ jobs:
137143
run: |
138144
set -x # print commands that are executed
139145
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-falcon"
146+
- name: Test litestar pinned
147+
run: |
148+
set -x # print commands that are executed
149+
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-litestar"
140150
- name: Test pyramid pinned
141151
run: |
142152
set -x # print commands that are executed

‎CHANGELOG.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,26 @@
11
# Changelog
22

3+
## 2.12.0
4+
5+
### Various fixes & improvements
6+
7+
- API: Expose the scope getters to top level API and use them everywhere (#3357) by @sl0thentr0py
8+
- API: `push_scope` deprecation warning (#3355) (#3355) by @szokeasaurusrex
9+
- API: Replace `push_scope` (#3353, #3354) by @szokeasaurusrex
10+
- API: Deprecate, avoid, or stop using `configure_scope` (#3348, #3349, #3350, #3351) by @szokeasaurusrex
11+
- OTel: Remove experimental autoinstrumentation (#3239) by @sentrivana
12+
- Graphene: Add span for grapqhl operation (#2788) by @czyber
13+
- AI: Add async support for `ai_track` decorator (#3376) by @czyber
14+
- CI: Workaround bug preventing Django test runs (#3371) by @szokeasaurusrex
15+
- CI: Remove Django setuptools pin (#3378) by @szokeasaurusrex
16+
- Tests: Test with Django 5.1 RC (#3370) by @sentrivana
17+
- Broaden `add_attachment` type (#3342) by @szokeasaurusrex
18+
- Add span data to the transactions trace context (#3374) by @antonpirker
19+
- Gracefully fail attachment path not found case (#3337) by @sl0thentr0py
20+
- Document attachment parameters (#3342) by @szokeasaurusrex
21+
- Bump checkouts/data-schemas from `0feb234` to `6d2c435` (#3369) by @dependabot
22+
- Bump checkouts/data-schemas from `88273a9` to `0feb234` (#3252) by @dependabot
23+
324
## 2.11.0
425

526
### Various fixes & improvements

‎README.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
<p align="center">
2-
<a href="https://sentry.io/?utm_source=github&utm_medium=logo" target="_blank">
3-
<img src="https://sentry-brand.storage.googleapis.com/sentry-wordmark-dark-280x84.png" alt="Sentry" width="280" height="84">
4-
</a>
5-
</p>
1+
<a href="https://sentry.io/?utm_source=github&utm_medium=logo" target="_blank">
2+
<img src="https://sentry-brand.storage.googleapis.com/github-banners/github-sdk-python.png" alt="Sentry for Python">
3+
</a>
64

7-
_Bad software is everywhere, and we're tired of it. Sentry is on a mission to help developers write better software faster, so we can get back to enjoying technology. If you want to join us [<kbd>**Check out our open positions**</kbd>](https://sentry.io/careers/)_
5+
_Bad software is everywhere, and we're tired of it. Sentry is on a mission to help developers write better software faster, so we can get back to enjoying technology. If you want to join us, [<kbd>**check out our open positions**</kbd>](https://sentry.io/careers/)_.
86

97
# Official Sentry SDK for Python
108

@@ -111,4 +109,4 @@ Licensed under the MIT license, see [`LICENSE`](LICENSE)
111109

112110
<a href="https://github.com/getsentry/sentry-python/graphs/contributors">
113111
<img src="https://contributors-img.web.app/image?repo=getsentry/sentry-python" />
114-
</a>
112+
</a>

‎docs/api.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,4 @@ Client Management
5151
Managing Scope (advanced)
5252
=========================
5353

54-
.. autofunction:: sentry_sdk.api.configure_scope
55-
.. autofunction:: sentry_sdk.api.push_scope
56-
5754
.. autofunction:: sentry_sdk.api.new_scope
58-

‎docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
copyright = "2019-{}, Sentry Team and Contributors".format(datetime.now().year)
2929
author = "Sentry Team and Contributors"
3030

31-
release = "2.11.0"
31+
release = "2.12.0"
3232
version = ".".join(release.split(".")[:2]) # The short X.Y version.
3333

3434

‎scripts/split-tox-gh-actions/split-tox-gh-actions.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
"arq",
8181
"beam",
8282
"celery",
83+
"dramatiq",
8384
"huey",
8485
"rq",
8586
"spark",
@@ -115,6 +116,7 @@
115116
"asgi",
116117
"bottle",
117118
"falcon",
119+
"litestar",
118120
"pyramid",
119121
"quart",
120122
"sanic",

‎scripts/split-tox-gh-actions/templates/base.jinja

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Do not edit this file. This file is generated automatically by executing
2+
# python scripts/split-tox-gh-actions/split-tox-gh-actions.py
3+
14
{% with lowercase_group=group | replace(" ", "_") | lower %}
25
name: Test {{ group }}
36

‎sentry_sdk/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
"capture_event",
2020
"capture_exception",
2121
"capture_message",
22-
"configure_scope",
2322
"continue_trace",
2423
"flush",
2524
"get_baggage",
@@ -33,7 +32,6 @@
3332
"isolation_scope",
3433
"last_event_id",
3534
"new_scope",
36-
"push_scope",
3735
"set_context",
3836
"set_extra",
3937
"set_level",

‎sentry_sdk/_types.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010

1111
if TYPE_CHECKING:
12-
from collections.abc import Container, MutableMapping
12+
from collections.abc import Container, MutableMapping, Sequence
1313

1414
from datetime import datetime
1515

@@ -25,6 +25,11 @@
2525
from typing import Union
2626
from typing_extensions import Literal, TypedDict
2727

28+
class SDKInfo(TypedDict):
29+
name: str
30+
version: str
31+
packages: Sequence[Mapping[str, str]]
32+
2833
# "critical" is an alias of "fatal" recognized by Relay
2934
LogLevelStr = Literal["fatal", "critical", "error", "warning", "info", "debug"]
3035

0 commit comments

Comments
 (0)