Multiple changessentry

- Make DSN variable that we read from the CI from the CI
- Upload debug symbols
- Fix packaging workflow; include new env vars & fix shecllchecks

Signed-off-by: Tasos Katsoulas <tasos@netdata.cloud>

4 files changed, 25 insertions, 16 deletions

diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml
index 12a4e84aa7..c864aef76d 100644
--- a/.github/workflows/packaging.yml
+++ b/.github/workflows/packaging.yml
@@ -209,19 +209,19 @@ jobs:
         id: set-telemetry-env-vars
         run: |
           if [[ "${{ github.repository }}" == 'netdata/netdata' ]] && [[ "${{ matrix.bundle_sentry }}" == true ]]; then
-            if [[ "${{ github.event_name }}" == 'workflow_dispatch' ]] || [[ "${{ contains(github.event.pull_request.labels.*.name, 'run-ci/sentry-upload') }}" == "true" ]]; then
-              echo "BUILDING_ENVIRONMENT=Production" >> $GITHUB_ENV
-              echo "UPLOAD_SENTRY=true" >> $GITHUB_ENV
-            elif [[ "${{ github.event_name }}" == "pull_request" ]] && [[ "${{ contains(github.event.pull_request.labels.*.name, 'run-ci/sentry-upload') }}" == "true" ]]; then
-              echo "BUILDING_ENVIRONMENT=Development-CI" >> $GITHUB_ENV
-              echo "UPLOAD_SENTRY=true" >> $GITHUB_ENV
-            else
-              echo "BUILDING_ENVIRONMENT=Development" >> $GITHUB_ENV
-              echo "UPLOAD_SENTRY=false" >> $GITHUB_ENV
-            fi
+              if [[ "${{ github.event_name }}" == 'workflow_dispatch' ]]; then
+                  echo "BUILDING_ENVIRONMENT=Production" >> $GITHUB_ENV
+                  echo "UPLOAD_SENTRY=true" >> $GITHUB_ENV
+              elif [[ "${{ github.event_name }}" == "pull_request" ]] && [[ "${{ contains(github.event.pull_request.labels.*.name, 'run-ci/sentry-upload') }}" == "true" ]]; then
+                  echo "BUILDING_ENVIRONMENT=Development-CI" >> $GITHUB_ENV
+                  echo "UPLOAD_SENTRY=true" >> $GITHUB_ENV
+              else
+                  echo "BUILDING_ENVIRONMENT=Development" >> $GITHUB_ENV
+                  echo "UPLOAD_SENTRY=false" >> $GITHUB_ENV
+              fi
           else
-            echo "BUILDING_ENVIRONMENT=Unknown" >> $GITHUB_ENV
-            echo "UPLOAD_SENTRY=false" >> $GITHUB_ENV
+              echo "BUILDING_ENVIRONMENT=Unknown" >> $GITHUB_ENV
+              echo "UPLOAD_SENTRY=false" >> $GITHUB_ENV
           fi
       - name: Setup QEMU
         id: qemu
@@ -252,7 +252,8 @@ jobs:
         run: |
           docker run --security-opt seccomp=unconfined -e DISABLE_TELEMETRY=1 -e VERSION=${{ needs.version-check.outputs.version }} \
                     -e ENABLE_SENTRY=${{ matrix.bundle_sentry }} -e BUILDING_ENVIRONMENT=${{ env.BUILDING_ENVIRONMENT }} \
-                    -e SENTRY_AUTH_TOKEN=${{secrets.SENTRY_API}} -e BUILD_DESTINATION=${{ matrix.distro }}${{ matrix.version }}_${{ matrix.platform }} \
+                    -e BUILD_DESTINATION=${{ matrix.distro }}${{ matrix.version }}_${{ matrix.arch }} -e UPLOAD_SENTRY=${{ env.UPLOAD_SENTRY }} \
+                    -e SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_CLI_TOKEN }} -e SENTRY_DSN=${{ secrets.SENTRY_DSN }} \
                      --platform=${{ matrix.platform }} -v "$PWD":/netdata netdata/package-builders:${{ matrix.distro }}${{ matrix.version }}-v1
       - name: Save Packages
         id: artifacts
diff --git a/config.cmake.h.in b/config.cmake.h.in
index 78737a96da..507d37bd8e 100644
--- a/config.cmake.h.in
+++ b/config.cmake.h.in
@@ -115,7 +115,7 @@
 #cmakedefine NETDATA_SENTRY_ENVIRONMENT "@NETDATA_SENTRY_ENVIRONMENT@"
 #cmakedefine NETDATA_SENTRY_RELEASE "@NETDATA_SENTRY_RELEASE@"
 #cmakedefine NETDATA_SENTRY_DIST "@NETDATA_SENTRY_DIST@"
-
+#cmakedefine NETDATA_SENTRY_DSN "@NETDATA_SENTRY_DSN@"
 // enabled bundling
 
 #cmakedefine ENABLE_BUNDLED_JSONC
diff --git a/contrib/debian/rules b/contrib/debian/rules
index 5434cca291..f8f5686847 100755
--- a/contrib/debian/rules
+++ b/contrib/debian/rules
@@ -41,11 +41,16 @@ ifeq ($(ENABLE_SENTRY),true)
     BUILDING_ENVIRONMENT ?= Unknown
     VERSION ?= Unknown
     BUILD_DESTINATION ?= Unknown
-    SENTRY_CONFIG := -DENABLE_SENTRY=On -DNETDATA_SENTRY_ENVIRONMENT=$(BUILDING_ENVIRONMENT) -DNETDATA_SENTRY_RELEASE=$(VERSION) -DNETDATA_SENTRY_DIST=$(BUILD_DESTINATION)
+    SENTRY_CONFIG := -DENABLE_SENTRY=On \
+        -DNETDATA_SENTRY_ENVIRONMENT=$(BUILDING_ENVIRONMENT) \
+        -DNETDATA_SENTRY_RELEASE=$(VERSION) \
+        -DNETDATA_SENTRY_DIST=$(BUILD_DESTINATION) \
+        -DNETDATA_SENTRY_DSN=$(SENTRY_DSN)
 else
     SENTRY_CONFIG := -DENABLE_SENTRY=Off
 endif
 
+
 %:
 	dh $@ --builddirectory=$(BUILDDIR)
 
@@ -93,6 +98,9 @@ override_dh_auto_test:
 	true
 
 override_dh_strip:
+	if [ "${ENABLE_SENTRY}" = "true" ] && [ "${UPLOAD_SENTRY}" = "true" ]; then
+		sentry-cli debug-files upload -o netdata-inc -p netdata-agent ${TOP}/usr/sbin/netdata
+	fi
 	dh_strip
 
 override_dh_install:
diff --git a/daemon/sentry-native/sentry-native.c b/daemon/sentry-native/sentry-native.c
index 1b8c1609c3..08297087d4 100644
--- a/daemon/sentry-native/sentry-native.c
+++ b/daemon/sentry-native/sentry-native.c
@@ -8,7 +8,7 @@ void sentry_native_init(void)
     sentry_options_t *options = sentry_options_new();
 
     // we should get this from CI (SENTRY_DSN)
-    sentry_options_set_dsn(options, "https://4c37747b97164e9bbfc9fa426e9200b4@o382276.ingest.sentry.io/4505069981401088");
+    sentry_options_set_dsn(options, NETDATA_SENTRY_DSN);
 
     // where to save sentry files
     char path[FILENAME_MAX];