Skip to content

Commit 48f0f31

Browse files
antonpirkerantonpirker
authored
Merge branch 'master' into getsentryGH-2696-transaction-source-enum
2 parents ef97faa + 60fb6fc commit 48f0f31

15 files changed

+30
-30
lines changed

‎.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
steps:
2121
- name: Get auth token
2222
id: token
23-
uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.0
23+
uses: actions/create-github-app-token@c1a285145b9d317df6ced56c09f525b5c2b6f755 # v1.11.1
2424
with:
2525
app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
2626
private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
coverage xml
8181
- name: Upload coverage to Codecov
8282
if: ${{ !cancelled() }}
83-
uses: codecov/[email protected].1
83+
uses: codecov/[email protected].2
8484
with:
8585
token: ${{ secrets.CODECOV_TOKEN }}
8686
files: coverage.xml
@@ -152,7 +152,7 @@ jobs:
152152
coverage xml
153153
- name: Upload coverage to Codecov
154154
if: ${{ !cancelled() }}
155-
uses: codecov/[email protected].1
155+
uses: codecov/[email protected].2
156156
with:
157157
token: ${{ secrets.CODECOV_TOKEN }}
158158
files: coverage.xml

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
coverage xml
100100
- name: Upload coverage to Codecov
101101
if: ${{ !cancelled() }}
102-
uses: codecov/[email protected].1
102+
uses: codecov/[email protected].2
103103
with:
104104
token: ${{ secrets.CODECOV_TOKEN }}
105105
files: coverage.xml

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
coverage xml
7777
- name: Upload coverage to Codecov
7878
if: ${{ !cancelled() }}
79-
uses: codecov/[email protected].1
79+
uses: codecov/[email protected].2
8080
with:
8181
token: ${{ secrets.CODECOV_TOKEN }}
8282
files: coverage.xml
@@ -144,7 +144,7 @@ jobs:
144144
coverage xml
145145
- name: Upload coverage to Codecov
146146
if: ${{ !cancelled() }}
147-
uses: codecov/[email protected].1
147+
uses: codecov/[email protected].2
148148
with:
149149
token: ${{ secrets.CODECOV_TOKEN }}
150150
files: coverage.xml

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
coverage xml
6565
- name: Upload coverage to Codecov
6666
if: ${{ !cancelled() }}
67-
uses: codecov/[email protected].1
67+
uses: codecov/[email protected].2
6868
with:
6969
token: ${{ secrets.CODECOV_TOKEN }}
7070
files: coverage.xml

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
coverage xml
104104
- name: Upload coverage to Codecov
105105
if: ${{ !cancelled() }}
106-
uses: codecov/[email protected].1
106+
uses: codecov/[email protected].2
107107
with:
108108
token: ${{ secrets.CODECOV_TOKEN }}
109109
files: coverage.xml
@@ -198,7 +198,7 @@ jobs:
198198
coverage xml
199199
- name: Upload coverage to Codecov
200200
if: ${{ !cancelled() }}
201-
uses: codecov/[email protected].1
201+
uses: codecov/[email protected].2
202202
with:
203203
token: ${{ secrets.CODECOV_TOKEN }}
204204
files: coverage.xml

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
coverage xml
7777
- name: Upload coverage to Codecov
7878
if: ${{ !cancelled() }}
79-
uses: codecov/[email protected].1
79+
uses: codecov/[email protected].2
8080
with:
8181
token: ${{ secrets.CODECOV_TOKEN }}
8282
files: coverage.xml
@@ -144,7 +144,7 @@ jobs:
144144
coverage xml
145145
- name: Upload coverage to Codecov
146146
if: ${{ !cancelled() }}
147-
uses: codecov/[email protected].1
147+
uses: codecov/[email protected].2
148148
with:
149149
token: ${{ secrets.CODECOV_TOKEN }}
150150
files: coverage.xml

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
coverage xml
9393
- name: Upload coverage to Codecov
9494
if: ${{ !cancelled() }}
95-
uses: codecov/[email protected].1
95+
uses: codecov/[email protected].2
9696
with:
9797
token: ${{ secrets.CODECOV_TOKEN }}
9898
files: coverage.xml
@@ -176,7 +176,7 @@ jobs:
176176
coverage xml
177177
- name: Upload coverage to Codecov
178178
if: ${{ !cancelled() }}
179-
uses: codecov/[email protected].1
179+
uses: codecov/[email protected].2
180180
with:
181181
token: ${{ secrets.CODECOV_TOKEN }}
182182
files: coverage.xml

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
coverage xml
7777
- name: Upload coverage to Codecov
7878
if: ${{ !cancelled() }}
79-
uses: codecov/[email protected].1
79+
uses: codecov/[email protected].2
8080
with:
8181
token: ${{ secrets.CODECOV_TOKEN }}
8282
files: coverage.xml
@@ -144,7 +144,7 @@ jobs:
144144
coverage xml
145145
- name: Upload coverage to Codecov
146146
if: ${{ !cancelled() }}
147-
uses: codecov/[email protected].1
147+
uses: codecov/[email protected].2
148148
with:
149149
token: ${{ secrets.CODECOV_TOKEN }}
150150
files: coverage.xml

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
coverage xml
9595
- name: Upload coverage to Codecov
9696
if: ${{ !cancelled() }}
97-
uses: codecov/[email protected].1
97+
uses: codecov/[email protected].2
9898
with:
9999
token: ${{ secrets.CODECOV_TOKEN }}
100100
files: coverage.xml
@@ -180,7 +180,7 @@ jobs:
180180
coverage xml
181181
- name: Upload coverage to Codecov
182182
if: ${{ !cancelled() }}
183-
uses: codecov/[email protected].1
183+
uses: codecov/[email protected].2
184184
with:
185185
token: ${{ secrets.CODECOV_TOKEN }}
186186
files: coverage.xml

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
coverage xml
9595
- name: Upload coverage to Codecov
9696
if: ${{ !cancelled() }}
97-
uses: codecov/[email protected].1
97+
uses: codecov/[email protected].2
9898
with:
9999
token: ${{ secrets.CODECOV_TOKEN }}
100100
files: coverage.xml
@@ -180,7 +180,7 @@ jobs:
180180
coverage xml
181181
- name: Upload coverage to Codecov
182182
if: ${{ !cancelled() }}
183-
uses: codecov/[email protected].1
183+
uses: codecov/[email protected].2
184184
with:
185185
token: ${{ secrets.CODECOV_TOKEN }}
186186
files: coverage.xml

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100
coverage xml
101101
- name: Upload coverage to Codecov
102102
if: ${{ !cancelled() }}
103-
uses: codecov/[email protected].1
103+
uses: codecov/[email protected].2
104104
with:
105105
token: ${{ secrets.CODECOV_TOKEN }}
106106
files: coverage.xml
@@ -192,7 +192,7 @@ jobs:
192192
coverage xml
193193
- name: Upload coverage to Codecov
194194
if: ${{ !cancelled() }}
195-
uses: codecov/[email protected].1
195+
uses: codecov/[email protected].2
196196
with:
197197
token: ${{ secrets.CODECOV_TOKEN }}
198198
files: coverage.xml

‎scripts/split_tox_gh_actions/templates/test_group.jinja

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292

9393
- name: Upload coverage to Codecov
9494
if: {% raw %}${{ !cancelled() }}{% endraw %}
95-
uses: codecov/[email protected].1
95+
uses: codecov/[email protected].2
9696
with:
9797
token: {% raw %}${{ secrets.CODECOV_TOKEN }}{% endraw %}
9898
files: coverage.xml

‎sentry_sdk/client.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ def _prepare_event(
532532

533533
for key in "release", "environment", "server_name", "dist":
534534
if event.get(key) is None and self.options[key] is not None:
535-
event[key] = str(self.options[key]).strip() # type: ignore[literal-required]
535+
event[key] = str(self.options[key]).strip()
536536
if event.get("sdk") is None:
537537
sdk_info = dict(SDK_INFO)
538538
sdk_info["integrations"] = sorted(self.integrations.keys())
@@ -581,7 +581,7 @@ def _prepare_event(
581581
self.transport.record_lost_event(
582582
"before_send", data_category="error"
583583
)
584-
event = new_event # type: ignore
584+
event = new_event
585585

586586
before_send_transaction = self.options["before_send_transaction"]
587587
if (
@@ -611,7 +611,7 @@ def _prepare_event(
611611
reason="before_send", data_category="span", quantity=spans_delta
612612
)
613613

614-
event = new_event # type: ignore
614+
event = new_event
615615

616616
return event
617617

‎sentry_sdk/integrations/rust_tracing.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@
4444

4545

4646
class RustTracingLevel(Enum):
47-
Trace: str = "TRACE"
48-
Debug: str = "DEBUG"
49-
Info: str = "INFO"
50-
Warn: str = "WARN"
51-
Error: str = "ERROR"
47+
Trace = "TRACE"
48+
Debug = "DEBUG"
49+
Info = "INFO"
50+
Warn = "WARN"
51+
Error = "ERROR"
5252

5353

5454
class EventTypeMapping(Enum):

0 commit comments

Comments
 (0)