Skip to content

Commit 156eef6

Browse files
hubertdeng123hubertdeng123
authored
Enforce error reporting for self-hosted (#1753)
1 parent 54ca9b0 commit 156eef6

File tree

2 files changed

+43
-95
lines changed

2 files changed

+43
-95
lines changed

‎install/_lib.sh‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,6 @@ umask 002
88
log_file="sentry_install_log-`date +'%Y-%m-%d_%H-%M-%S'`.txt"
99
exec &> >(tee -a "$log_file")
1010

11-
# Thanks to https://tldp.org/LDP/abs/html/intandnonint.html
12-
if [[ "$(tty)" == "not a tty" ]]; then
13-
PROMPTABLE=0
14-
else
15-
PROMPTABLE=1
16-
fi
17-
1811
# Work from /install/ for install.sh, project root otherwise
1912
if [[ "$(basename $0)" = "install.sh" ]]; then
2013
cd "$(dirname $0)/install/"

‎install/error-handling.sh‎

Lines changed: 43 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -41,96 +41,51 @@ send_event() {
4141
}
4242

4343
if [[ -z "${REPORT_SELF_HOSTED_ISSUES:-}" ]]; then
44-
if [[ $PROMPTABLE == "0" ]]; then
45-
echo
46-
echo "Hey, so ... we would love to automatically find out about issues with your"
47-
echo "Sentry instance so that we can improve the product. Turns out there is an app"
48-
echo "for that, called Sentry. Would you be willing to let us automatically send data"
49-
echo "about your instance upstream to Sentry for development and debugging purposes?"
50-
echo "If so, rerun with:"
51-
echo
52-
echo " ./install.sh --report-self-hosted-issues"
53-
echo
54-
echo " or"
55-
echo
56-
echo " REPORT_SELF_HOSTED_ISSUES=1 ./install.sh"
57-
echo
58-
echo "(Btw, we send this to our own self-hosted Sentry instance, not to Sentry SaaS,"
59-
echo "so that we can be in this together.)"
60-
echo
61-
echo "Here's the info we may collect:"
62-
echo
63-
echo " - OS username"
64-
echo " - IP address"
65-
echo " - install log"
66-
echo " - runtime errors"
67-
echo " - performance data"
68-
echo
69-
echo "Thirty (30) day retention. No marketing. Privacy policy at sentry.io/privacy."
70-
echo
71-
echo "For now we are defaulting to not reporting upstream, but our plan is to"
72-
echo "hard-require a choice from you starting in version 22.10.0, because let's be"
73-
echo "honest, none of you will act on this otherwise. To avoid disruption you can use"
74-
echo "one of these flags:"
75-
echo
76-
echo " --report-self-hosted-issues"
77-
echo " --no-report-self-hosted-issues"
78-
echo
79-
echo "or set the REPORT_SELF_HOSTED_ISSUES environment variable:"
80-
echo
81-
echo " REPORT_SELF_HOSTED_ISSUES=1 to send data"
82-
echo " REPORT_SELF_HOSTED_ISSUES=0 to not send data"
83-
echo
84-
echo "Thanks for using Sentry."
85-
echo
86-
export REPORT_SELF_HOSTED_ISSUES=0 # opt-in for now
87-
else
88-
echo
89-
echo "Hey, so ... we would love to automatically find out about issues with your"
90-
echo "Sentry instance so that we can improve the product. Turns out there is an app"
91-
echo "for that, called Sentry. Would you be willing to let us automatically send data"
92-
echo "about your instance upstream to Sentry for development and debugging purposes?"
93-
echo
94-
echo " y / yes / 1"
95-
echo " n / no / 0"
96-
echo
97-
echo "(Btw, we send this to our own self-hosted Sentry instance, not to Sentry SaaS,"
98-
echo "so that we can be in this together.)"
99-
echo
100-
echo "Here's the info we may collect:"
101-
echo
102-
echo " - OS username"
103-
echo " - IP address"
104-
echo " - install log"
105-
echo " - runtime errors"
106-
echo " - performance data"
107-
echo
108-
echo "Thirty (30) day retention. No marketing. Privacy policy at sentry.io/privacy."
109-
echo
44+
echo
45+
echo "Hey, so ... we would love to automatically find out about issues with your"
46+
echo "Sentry instance so that we can improve the product. Turns out there is an app"
47+
echo "for that, called Sentry. Would you be willing to let us automatically send data"
48+
echo "about your instance upstream to Sentry for development and debugging purposes?"
49+
echo
50+
echo " y / yes / 1"
51+
echo " n / no / 0"
52+
echo
53+
echo "(Btw, we send this to our own self-hosted Sentry instance, not to Sentry SaaS,"
54+
echo "so that we can be in this together.)"
55+
echo
56+
echo "Here's the info we may collect:"
57+
echo
58+
echo " - OS username"
59+
echo " - IP address"
60+
echo " - install log"
61+
echo " - runtime errors"
62+
echo " - performance data"
63+
echo
64+
echo "Thirty (30) day retention. No marketing. Privacy policy at sentry.io/privacy."
65+
echo
11066

111-
yn=""
112-
until [ ! -z "$yn" ]
113-
do
114-
read -p "y or n? " yn
115-
case $yn in
116-
y | yes | 1) export REPORT_SELF_HOSTED_ISSUES=1; echo; echo -n "Thank you.";;
117-
n | no | 0) export REPORT_SELF_HOSTED_ISSUES=0; echo; echo -n "Understood.";;
118-
*) yn="";;
119-
esac
120-
done
67+
yn=""
68+
until [ ! -z "$yn" ]
69+
do
70+
read -p "y or n? " yn
71+
case $yn in
72+
y | yes | 1) export REPORT_SELF_HOSTED_ISSUES=1; echo; echo -n "Thank you.";;
73+
n | no | 0) export REPORT_SELF_HOSTED_ISSUES=0; echo; echo -n "Understood.";;
74+
*) yn="";;
75+
esac
76+
done
12177

122-
echo " To avoid this prompt in the future, use one of these flags:"
123-
echo
124-
echo " --report-self-hosted-issues"
125-
echo " --no-report-self-hosted-issues"
126-
echo
127-
echo "or set the REPORT_SELF_HOSTED_ISSUES environment variable:"
128-
echo
129-
echo " REPORT_SELF_HOSTED_ISSUES=1 to send data"
130-
echo " REPORT_SELF_HOSTED_ISSUES=0 to not send data"
131-
echo
132-
sleep 5
133-
fi
78+
echo " To avoid this prompt in the future, use one of these flags:"
79+
echo
80+
echo " --report-self-hosted-issues"
81+
echo " --no-report-self-hosted-issues"
82+
echo
83+
echo "or set the REPORT_SELF_HOSTED_ISSUES environment variable:"
84+
echo
85+
echo " REPORT_SELF_HOSTED_ISSUES=1 to send data"
86+
echo " REPORT_SELF_HOSTED_ISSUES=0 to not send data"
87+
echo
88+
sleep 5
13489
fi
13590

13691
# Make sure we can use sentry-cli if we need it.

0 commit comments

Comments
 (0)