Skip to content

fix: Bump sentry-sdk to git sha #22552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

fix: Bump sentry-sdk to git sha #22552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e61b9ca
fix: Bump sentry-sdk to git sha
untitaker Dec 9, 2020
faef7ed
revert auto_enabling_integrations
untitaker Dec 9, 2020
f558939
fix requirements
untitaker Dec 9, 2020
0943fe2
try to add git to build deps
untitaker Dec 9, 2020
c393526
add to right stage
untitaker Dec 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ ENV PIP_NO_CACHE_DIR=off \
COPY /dist/requirements.txt /tmp/dist/requirements.txt
RUN set -x \
&& buildDeps="" \
# ability to install git dependencies
&& buildDeps="$buildDeps \
git \
Copy link
Member

@BYK BYK Dec 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We won't be shipping git in prod images ever. If you ever need it, it should probably be in the builder image: https://github.com/getsentry/sentry/blob/master/docker/builder.dockerfile

Copy link
Member Author

@untitaker untitaker Dec 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fwiw this is installed and uninstalled within the same build step, as all buildDeps.

Copy link
Member

@BYK BYK Dec 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, right missed that. Still it would be ideal not to use git. Will propose something below.

" \
# uwsgi
&& buildDeps="$buildDeps \
gcc \
Expand Down
2 changes: 1 addition & 1 deletion requirements-base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ rfc3339-validator==0.1.2
rfc3986-validator==0.1.1
# [end] jsonschema format validators
sentry-relay>=0.8.1,<0.9.0
sentry-sdk>=0.17.7,<0.18.0
sentry-sdk @ git+https://github.com/getsentry/sentry-python@c277ed5#egg=sentry-sdk
Copy link
Member

@BYK BYK Dec 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This prevents us from deploying to PyPI so I'll have to block this PR unfortunately.

Copy link
Member

@BYK BYK Dec 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
sentry-sdk @ git+https://github.com/getsentry/sentry-python@c277ed5#egg=sentry-sdk
sentry-sdk @ https://github.com/getsentry/sentry-python/archive/c277ed5d1170a7d58fe3482173d391ae799fdc0a.zip#egg=sentry-sdk

simplejson>=3.11.0,<3.12.0
six>=1.11.0,<1.12.0
sqlparse>=0.2.0,<0.3.0
Expand Down
1 change: 1 addition & 0 deletions src/sentry/utils/sdk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ def _capture_anything(self, method_name, *args, **kwargs):

sentry_sdk.init(
transport=MultiplexingTransport(),
auto_enabling_integrations=False,
integrations=[
DjangoIntegration(),
CeleryIntegration(),
Expand Down