Skip to content

Revert "fix(dev): Do not export SENTRY_DSN in .envrc" #33826

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

Merged
merged 1 commit into from
Apr 21, 2022
Merged

Revert "fix(dev): Do not export SENTRY_DSN in .envrc" #33826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions .envrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,7 @@ report_to_sentry() {
curl -sL https://sentry.io/get-cli/ | bash
fi
# Report to sentry-dev-env project
SENTRY_DSN="https://[email protected]/5723503" \
sentry-cli send-event -m "$error_message" --logfile "$_SENTRY_LOG_FILE" --level $log_level
sentry-cli send-event -m "$error_message" --logfile "$_SENTRY_LOG_FILE" --level $log_level
rm "$_SENTRY_LOG_FILE"
}

Expand Down Expand Up @@ -143,6 +142,8 @@ fi
if [ -n "${SENTRY_DEVENV_NO_REPORT+x}" ]; then
debug "No development environment errors will be reported (since you've defined SENTRY_DEVENV_NO_REPORT)."
else
# This is necessary for the bash-hook in lib.sh to work
export SENTRY_DSN="https://[email protected]/5723503"
# Since direnv traps the EXIT signal we place the temp file under /tmp for the odd time
# the script will use the EXIT path
_SENTRY_LOG_FILE=$(mktemp /tmp/sentry.envrc.$$.out || mktemp /tmp/sentry.envrc.XXXXXXXX.out)
Expand Down
4 changes: 2 additions & 2 deletions config/hooks/pre-commit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ if sys.version_info.major < 3:
try:
import sentry_sdk

if not os.environ.get("SENTRY_DEVENV_NO_REPORT"):
sentry_sdk.init(dsn="https://[email protected]/5723503")
if os.environ.get("SENTRY_DSN"):
sentry_sdk.init(dsn=os.environ["SENTRY_DSN"])
else:
sys.stdout.write(
"WARNING: Errors in this file will not be reported to Sentry since SENTRY_DSN is not set.\n"
Expand Down
22 changes: 9 additions & 13 deletions scripts/lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,6 @@ if [ -z "${CI+x}" ]; then
green="$(tput setaf 2)"
yellow="$(tput setaf 3)"
reset="$(tput sgr0)"
if [ -z "${SENTRY_DEVENV_NO_REPORT+x}" ]; then
sentry_cli_major_version="$(sentry-cli --version | awk '{print $2}' | sed 's/\([0-9]*\).*/\1/')"
# XXX: Until we support version 2.x
if [ $sentry_cli_major_version -lt 2 ]; then
# sentry-dev-env project
export SENTRY_DSN="https://[email protected]/5723503"
eval "$(sentry-cli bash-hook)"
else
echo "You are using the latest major release of sentry-cli."
echo "${yellow}Please remove it and we will install the correct version: rm $(which sentry-cli)${reset}"
exit 1
fi
fi
fi

venv_name=".venv"
Expand All @@ -46,6 +33,15 @@ configure-sentry-cli() {
# XXX: Temporary install version 1.74.3 until we upgrade to version 2.x
curl -sL https://gist.githubusercontent.com/armenzg/96481b0b653ecf807900373f5af09816/raw/caf5695e0eb6c214ec84f9fc217965aec928acc0/get-cli.sh | bash
fi
sentry_cli_major_version="$(sentry-cli --version | awk '{print $2}' | sed 's/\([0-9]*\).*/\1/')"
# XXX: Until we support version 2.x
if [ $sentry_cli_major_version -lt 2 ]; then
eval "$(sentry-cli bash-hook)"
else
echo "You are using the latest major release of sentry-cli."
echo "${yellow}Please remove it and we will install the correct version: rm $(which sentry-cli)${reset}"
exit 1
fi
fi
}

Expand Down