Upload debug file information

Author: Su5eD

.github/workflows/docker-publish.yml

@@ -20,23 +20,28 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+
       - name: Install cosign
         uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20 #v3.5.0
         with:
           cosign-release: 'v2.2.4'
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
+
       - name: Log into registry ${{ env.REGISTRY }}
         uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Extract Docker metadata
         id: meta
         uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
       - name: Build and push Docker image
         id: build-and-push
         uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
@@ -47,11 +52,30 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
+
       - name: Sign the published Docker image
         env:
           TAGS: ${{ steps.meta.outputs.tags }}
           DIGEST: ${{ steps.build-and-push.outputs.digest }}
         run: echo "${TAGS}" | xargs -I {} cosign sign --yes {}@${DIGEST}
+
+      - name: Build debug image
+        uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
+        with:
+          push: false
+          target: build
+          tags: sinytra/mm_wiki_debug
+
+      - name: Upload to sentry
+        env:
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+        run: |
+          docker run --rm -e SENTRY_AUTH_TOKEN -e SENTRY_ORG -e SENTRY_PROJECT sinytra/mm_wiki_debug /bin/bash -c "
+            sentry-cli debug-files upload --include-sources build/bin/wiki_service build/bin/wiki_service.debug
+            LIBS=\$(ldd build/bin/wiki_service | awk '/=>/ {print \$3}' | grep '^/')
+            sentry-cli debug-files upload --include-sources \$LIBS
+          "
+
   deploy:
     name: Deploy to server
     runs-on: ubuntu-latest

Dockerfile

@@ -7,7 +7,10 @@ RUN apt-get update && apt-get install -y \
     cmake git gcc g++ ninja-build \
     uuid-dev zlib1g-dev libc-ares-dev libbrotli-dev \
     postgresql-all libhiredis-dev libspdlog-dev libzip-dev \
-    libcurl4-openssl-dev
+    libcurl4-openssl-dev curl binutils
+
+# Install Sentry CLI
+RUN curl -sL https://sentry.io/get-cli/ | sh
 
 # Build and install jsoncpp
 RUN git clone https://github.com/open-source-parsers/jsoncpp && cd jsoncpp && git checkout 1.9.6 \
@@ -22,16 +25,25 @@ RUN git clone https://github.com/drogonframework/drogon && cd drogon && git subm
 # Build app
 WORKDIR /build/src
 
-COPY $PWD /build/src
+COPY $PWD/.git /build/src/.git
+COPY $PWD/builtin /build/src/builtin
+COPY $PWD/modules /build/src/modules
+COPY $PWD/src /build/src/src
+COPY $PWD/CMakeLists.txt /build/src/
+
+RUN cmake -S . -B build -G "Ninja" && cmake --build build --config RelWithDebInfo
 
-RUN cmake -S . -B build -G "Ninja" && cmake --build build --config Release
+# Extract debug info
+RUN objcopy --only-keep-debug --compress-debug-sections=zlib build/bin/wiki_service build/bin/wiki_service.debug \
+    && objcopy --strip-debug --strip-unneeded build/bin/wiki_service \
+    && objcopy --add-gnu-debuglink=build/bin/wiki_service.debug build/bin/wiki_service
 
 FROM debian:sid-slim AS main
 
 WORKDIR /app
 
 RUN apt-get update && apt-get install -y ca-certificates libspdlog-dev libc-ares-dev libfmt10 libbrotli-dev \
-    libhiredis-dev libpq5 libzip-dev
+    libhiredis-dev libpq5 libzip-dev curl
 
 COPY --from=build /build/src/build/bin/wiki_service /build/src/build/bin/crashpad_handler /app/
 

src/monitoring.cc

@@ -13,6 +13,7 @@ namespace monitoring {
         sentry_options_set_release(options, PROJECT_GIT_HASH_FULL);
 #endif
         sentry_options_set_debug(options, 1);
+        sentry_options_set_crashpad_wait_for_upload(options, true);
         sentry_init(options);
     }