Skip to content

Commit e53e060

Browse files
Merge pull request ClickHouse#80236 from ClickHouse/no-sentry
Remove Sentry
2 parents 4169897 + 43f26fa commit e53e060

File tree

30 files changed

+314
-498
lines changed

30 files changed

+314
-498
lines changed

.github/ISSUE_TEMPLATE/85_bug-report.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ body:
3838
> Change "enabled" to true in "send_crash_reports" section in `config.xml`:
3939
```xml
4040
<send_crash_reports>
41-
<!-- Changing <enabled> to true allows sending crash reports to -->
42-
<!-- the ClickHouse core developers team via Sentry https://sentry.io -->
43-
<enabled>false</enabled>
41+
<!-- Changing <enabled> to true allows sending crash reports to -->
42+
<!-- the ClickHouse core developers team. -->
43+
<enabled>true</enabled>
4444
</send_crash_reports>
4545
```
4646
-----

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,6 @@
137137
[submodule "contrib/fmtlib"]
138138
path = contrib/fmtlib
139139
url = https://github.com/fmtlib/fmt
140-
[submodule "contrib/sentry-native"]
141-
path = contrib/sentry-native
142-
url = https://github.com/ClickHouse/sentry-native
143140
[submodule "contrib/krb5"]
144141
path = contrib/krb5
145142
url = https://github.com/ClickHouse/krb5

ci/docker/fasttest/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ RUN apt-get update \
1414
apt-utils \
1515
ca-certificates \
1616
curl \
17+
netcat-openbsd \
1718
gnupg \
1819
lsb-release \
1920
wget \

contrib/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,6 @@ add_contrib (amqpcpp-cmake AMQP-CPP) # requires: libuv
138138
add_contrib (cassandra-cmake cassandra) # requires: libuv
139139
add_contrib (curl-cmake curl)
140140
add_contrib (azure-cmake azure) # requires: curl
141-
if (NOT OS_DARWIN)
142-
add_contrib (sentry-native-cmake sentry-native) # requires: curl
143-
endif()
144141
add_contrib (fmtlib-cmake fmtlib)
145142
add_contrib (krb5-cmake krb5)
146143
add_contrib (cyrus-sasl-cmake cyrus-sasl) # for krb5

contrib/sentry-native

Lines changed: 0 additions & 1 deletion
This file was deleted.

contrib/sentry-native-cmake/CMakeLists.txt

Lines changed: 0 additions & 63 deletions
This file was deleted.

docs/en/operations/_troubleshooting.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ You are running a simple `docker run clickhouse/clickhouse-server` and it crashe
7272
```bash
7373
$ docker run -it clickhouse/clickhouse-server
7474
........
75-
2024.11.06 21:04:48.912036 [ 1 ] {} <Information> SentryWriter: Sending crash reports is disabled
7675
Poco::Exception. Code: 1000, e.code() = 0, System exception: cannot start thread, Stack trace (when copying this message, always include the lines below):
7776
7877
0. Poco::ThreadImpl::startImpl(Poco::SharedPtr<Poco::Runnable, Poco::ReferenceCounter, Poco::ReleasePolicy<Poco::Runnable>>) @ 0x00000000157c7b34

docs/en/operations/server-configuration-parameters/_server_settings_outside_source.md

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -992,24 +992,17 @@ Log properties can be omitted by commenting out the property. For example, if yo
992992

993993
## send_crash_reports {#send_crash_reports}
994994

995-
Settings for opt-in sending of crash reports to the ClickHouse core developers team via [Sentry](https://sentry.io).
995+
Settings for sending of crash reports to the ClickHouse core developers team.
996996

997997
Enabling it, especially in pre-production environments, is highly appreciated.
998998

999-
The server will need access to the public internet via IPv4 (at the time of writing IPv6 is not supported by Sentry) for this feature to function properly.
1000-
1001999
Keys:
10021000

1003-
| Key | Description |
1004-
|-----------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
1005-
| `enabled` | Boolean flag to enable the feature, `false` by default. Set to `true` to allow sending crash reports. |
1006-
| `send_logical_errors` | `LOGICAL_ERROR` is like an `assert`, it is a bug in ClickHouse. This boolean flag enables sending this exceptions to sentry (Default: `false`). |
1007-
| `endpoint` | You can override the Sentry endpoint URL for sending crash reports. It can be either a separate Sentry account or your self-hosted Sentry instance. Use the [Sentry DSN](https://docs.sentry.io/error-reporting/quickstart/?platform=native#configure-the-sdk) syntax. |
1008-
| `anonymize` | Avoid attaching the server hostname to the crash report. |
1009-
| `http_proxy` | Configure HTTP proxy for sending crash reports. |
1010-
| `debug` | Sets the Sentry client into debug mode. |
1011-
| `tmp_path` | Filesystem path for temporary crash report state. |
1012-
| `environment` | An arbitrary name of an environment in which the ClickHouse server is running. It will be mentioned in each crash report. The default value is `test` or `prod` depending on the version of ClickHouse.|
1001+
| Key | Description |
1002+
|-----------------------|--------------------------------------------------------------------------------------------------------------------------------------|
1003+
| `enabled` | Boolean flag to enable the feature, `true` by default. Set to `false` to avoid sending crash reports. |
1004+
| `send_logical_errors` | `LOGICAL_ERROR` is like an `assert`, it is a bug in ClickHouse. This boolean flag enables sending this exceptions (Default: `true`). |
1005+
| `endpoint` | You can override the endpoint URL for sending crash reports. |
10131006

10141007
**Recommended usage**
10151008

programs/server/config.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1691,13 +1691,12 @@
16911691

16921692
<send_crash_reports>
16931693
<!-- Setting <enabled> to true allows sending crash reports to -->
1694-
<!-- the ClickHouse core developers team via Sentry https://sentry.io -->
1694+
<!-- the ClickHouse core developers team. -->
16951695
<!-- Doing so at least in pre-production environments is highly appreciated -->
1696+
<!-- The reports are anonymized -->
16961697
<enabled>true</enabled>
16971698
<send_logical_errors>true</send_logical_errors>
1698-
<!-- The reports are anonymized by default -->
1699-
<anonymize>true</anonymize>
1700-
<endpoint>https://[email protected]/5226277</endpoint>
1699+
<endpoint>https://crash.clickhouse.com/</endpoint>
17011700
</send_crash_reports>
17021701

17031702
<!-- Uncomment to disable ClickHouse internal DNS caching. -->

programs/server/config.yaml.example

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -931,14 +931,8 @@ query_masking_rules:
931931
# response_content: config://http_server_default_response
932932

933933
send_crash_reports:
934-
# Changing <enabled> to true allows sending crash reports to
935-
# the ClickHouse core developers team via Sentry https://sentry.io
936-
# Doing so at least in pre-production environments is highly appreciated
937-
enabled: false
938-
# Change <anonymize> to true if you don't feel comfortable attaching the server hostname to the crash report
939-
anonymize: false
940-
# Default endpoint should be changed to different Sentry DSN only if you have
941-
# some in-house engineers or hired consultants who're going to debug ClickHouse issues for you
942-
endpoint: 'https://[email protected]/5226277'
943-
# Uncomment to disable ClickHouse internal DNS caching.
944-
# disable_internal_dns_cache: 1
934+
enabled: true
935+
endpoint: 'https://crash.clickhouse.com/'
936+
937+
# Uncomment to disable ClickHouse internal DNS caching.
938+
# disable_internal_dns_cache: 1

0 commit comments

Comments
 (0)