Skip to content

Commit f0664f7

Browse files
committed
Merge branch 'master' into potel-base
2 parents 9ddfa93 + 5d26201 commit f0664f7

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

.github/workflows/release-comment-issues.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ jobs:
1717
steps:
1818
- name: Get version
1919
id: get_version
20-
run: echo "version=${{ github.event.inputs.version || github.event.release.tag_name }}" >> $GITHUB_OUTPUT
20+
env:
21+
INPUTS_VERSION: ${{ github.event.inputs.version }}
22+
RELEASE_TAG_NAME: ${{ github.event.release.tag_name }}
23+
run: echo "version=${$INPUTS_VERSION:-$RELEASE_TAG_NAME}" >> "$GITHUB_OUTPUT"
2124

2225
- name: Comment on linked issues that are mentioned in release
2326
if: |
@@ -28,4 +31,4 @@ jobs:
2831
uses: getsentry/release-comment-issues-gh-action@v1
2932
with:
3033
github_token: ${{ secrets.GITHUB_TOKEN }}
31-
version: ${{ steps.get_version.outputs.version }}
34+
version: ${{ steps.get_version.outputs.version }}

sentry_sdk/integrations/asgi.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -255,12 +255,12 @@ def event_processor(self, event, hint, asgi_scope):
255255
event["request"] = deepcopy(request_data)
256256

257257
# Only set transaction name if not already set by Starlette or FastAPI (or other frameworks)
258+
transaction = event.get("transaction")
259+
transaction_source = (event.get("transaction_info") or {}).get("source")
258260
already_set = (
259-
"transaction" in event
260-
and event["transaction"] != _DEFAULT_TRANSACTION_NAME
261-
and "transaction_info" in event
262-
and "source" in event["transaction_info"]
263-
and event["transaction_info"]["source"]
261+
transaction is not None
262+
and transaction != _DEFAULT_TRANSACTION_NAME
263+
and transaction_source
264264
in [
265265
TransactionSource.COMPONENT,
266266
TransactionSource.ROUTE,

0 commit comments

Comments
 (0)