From 34ebdbfffb1143e166c4afce29ae5a67c7de0ada Mon Sep 17 00:00:00 2001 From: Bogdan Popa Date: Sun, 22 Oct 2023 10:00:25 +0300 Subject: [PATCH] core: drop Sentry --- .github/workflows/build_linux.yml | 2 -- .github/workflows/build_macos.yml | 4 ---- .github/workflows/build_win32.yml | 2 -- core/info.rkt | 1 - core/main.rkt | 12 +++--------- core/pool.rkt | 3 --- core/secret.rkt | 1 - 7 files changed, 3 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml index 0f1e0c0..5eef2f4 100644 --- a/.github/workflows/build_linux.yml +++ b/.github/workflows/build_linux.yml @@ -23,10 +23,8 @@ jobs: - name: Prepare secrets run: | echo -n "$LICENSE_SECRET" | base64 -d > core/secrets/license-secret.txt - echo -n "$SENTRY_DSN" | base64 -d > core/secrets/sentry-dsn.txt env: LICENSE_SECRET: ${{ secrets.LICENSE_SECRET }} - SENTRY_DSN: ${{ secrets.SENTRY_DSN }} - name: Install core run: raco pkg install -D --batch --auto --name franz core/ - name: Install FranzCross diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml index 1da6ed2..799cafa 100644 --- a/.github/workflows/build_macos.yml +++ b/.github/workflows/build_macos.yml @@ -21,10 +21,8 @@ jobs: - name: Prepare secrets run: | echo -n "$LICENSE_SECRET" | base64 --decode -o core/secrets/license-secret.txt - echo -n "$SENTRY_DSN" | base64 --decode -o core/secrets/sentry-dsn.txt env: LICENSE_SECRET: ${{ secrets.LICENSE_SECRET }} - SENTRY_DSN: ${{ secrets.SENTRY_DSN }} - name: Build core arm64 run: | raco cross \ @@ -77,10 +75,8 @@ jobs: - name: Prepare secrets run: | echo -n "$LICENSE_SECRET" | base64 --decode -o core/secrets/license-secret.txt - echo -n "$SENTRY_DSN" | base64 --decode -o core/secrets/sentry-dsn.txt env: LICENSE_SECRET: ${{ secrets.LICENSE_SECRET }} - SENTRY_DSN: ${{ secrets.SENTRY_DSN }} - name: Install core run: raco pkg install -D --batch --auto --name franz core/ - name: Build manual diff --git a/.github/workflows/build_win32.yml b/.github/workflows/build_win32.yml index 7036cd6..020872c 100644 --- a/.github/workflows/build_win32.yml +++ b/.github/workflows/build_win32.yml @@ -25,12 +25,10 @@ jobs: run: | echo -n "$DEVELOPER_ID_CER_P12" | base64 -d > developer_id.p12 echo -n "$LICENSE_SECRET" | base64 -d > core/secrets/license-secret.txt - echo -n "$SENTRY_DSN" | base64 -d > core/secrets/sentry-dsn.txt shell: bash env: DEVELOPER_ID_CER_P12: ${{ secrets.DEVELOPER_ID_CER_P12 }} LICENSE_SECRET: ${{ secrets.LICENSE_SECRET }} - SENTRY_DSN: ${{ secrets.SENTRY_DSN }} - name: Install core run: | raco pkg install -D --batch --auto --force libsqlite3 diff --git a/core/info.rkt b/core/info.rkt index a5894e0..a06678a 100644 --- a/core/info.rkt +++ b/core/info.rkt @@ -19,7 +19,6 @@ ["noise-serde-lib" #:version "0.4"] "protocol-buffers-lib" ["sasl-lib" #:version "1.3"] - ["sentry-lib" #:version "0.2.2"] "snappy-lib" "threading-lib")) (define build-deps '("rackunit-lib")) diff --git a/core/main.rkt b/core/main.rkt index 510c0e3..6579a5a 100644 --- a/core/main.rkt +++ b/core/main.rkt @@ -5,7 +5,6 @@ noise/backend noise/serde racket/file - sentry "appdata.rkt" "logger.rkt" @@ -45,16 +44,11 @@ [else (build-application-path "metadata.sqlite3")])) (log-franz-debug "database path: ~a" database-path) - (parameterize ([current-connection (make-database database-path)] - [current-sentry (make-sentry sentry-dsn #:release franz-version)]) + (parameterize ([current-connection (make-database database-path)]) (migrate!) (maybe-adjust-trial-deadline) - (parameterize ([current-sentry-user (make-sentry-user #:id (get-buid))] - [http:current-user-agent (make-user-agent)]) - (dynamic-wind - (λ () (void)) - (λ () (proc)) - (λ () (sentry-stop)))))) + (parameterize ([http:current-user-agent (make-user-agent)]) + (proc)))) (define (main in-fd out-fd) (call-with-main-parameterization diff --git a/core/pool.rkt b/core/pool.rkt index 67a808a..555a32e 100644 --- a/core/pool.rkt +++ b/core/pool.rkt @@ -6,7 +6,6 @@ racket/list racket/match racket/promise - sentry threading "broker.rkt" "connection-details.rkt" @@ -55,7 +54,6 @@ (define res-state (with-handlers ([exn:fail? (lambda (e) - (sentry-capture-exception! e) (begin0 s ((error-display-handler) (format "pool: ~a" (exn-message e)) @@ -492,7 +490,6 @@ (lambda (res-or-err) (begin0 res-or-err (when (exn:fail? res-or-err) - (sentry-capture-exception! res-or-err) (raise res-or-err)))))) diff --git a/core/secret.rkt b/core/secret.rkt index 497ec04..afe3f55 100644 --- a/core/secret.rkt +++ b/core/secret.rkt @@ -31,5 +31,4 @@ (provide id)) ...)])) (define-secrets - [sentry-dsn "secrets/sentry-dsn.txt"] [license-secret "secrets/license-secret.txt"])