feat(STAFF-141096): Get latest changes of getsentry/sentry-native

.craft.yml

@@ -5,7 +5,9 @@ targets:
   - name: registry
     sdks:
       github:getsentry/sentry-native:
+      maven:io.sentry:sentry-native-ndk:
   - name: gcs
+    includeNames: /^(sentry-native\.zip)$/
     bucket: sentry-sdk-assets
     paths:
       - path: /sentry-native/{{version}}/
@@ -14,5 +16,15 @@ targets:
       - path: /sentry-native/latest/
         metadata:
           cacheControl: public, max-age=600
+  - name: maven
+    includeNames: /^(sentry-native-ndk-).*\.zip$/
+    mavenCliPath: scripts/mvnw
+    mavenSettingsPath: scripts/settings.xml
+    mavenRepoId: ossrh
+    mavenRepoUrl: https://oss.sonatype.org/service/local/staging/deploy/maven2/
+    android:
+      distDirRegex: /^(sentry-native-ndk).*$/
+      fileReplaceeRegex: /\d+\.\d+\.\d+(-\w+(\.\d+)?)?(-SNAPSHOT)?/
+      fileReplacerStr: release.aar
 requireNames:
   - /^sentry-native.zip$/

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,7 +2,7 @@
 name: Bug report
 about: Create a report to help us improve
 title: ""
-labels: ""
+labels: "Platform: Native"
 assignees: ""
 ---
 

.github/workflows/ci.yml

@@ -5,21 +5,29 @@ on:
     branches:
       - master
       - "release/**"
+    paths-ignore:
+      - "*.md"
   pull_request:
+    paths-ignore:
+      - "*.md"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   lint:
     name: Lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - run: make style
 
   build-ios:
     name: Xcode Build for iOS
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: "recursive"
       - run: |
@@ -31,125 +39,148 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: Linux (gcc 7, 32-bit)
-            os: ubuntu-18.04
+          - name: Linux (GCC 7, 32-bit)
+            os: ubuntu-20.04
             CC: gcc-7
             CXX: g++-7
             TEST_X86: 1
-          - name: Linux (gcc 10)
-            os: ubuntu-20.04
-            CC: gcc-10
-            CXX: g++-10
+          - name: Linux (GCC 12)
+            os: ubuntu-22.04
+            CC: gcc-12
+            CXX: g++-12
             # ERROR_ON_WARNINGS: 1
             # The GCC analyzer 10.0.1 (as on CI) has an internal compiler error
             # currently, and is not stable enough to activate.
             # RUN_ANALYZER: gcc
-          - name: Linux (clang 11 + asan + llvm-cov)
-            os: ubuntu-20.04
-            CC: clang-11
-            CXX: clang++-11
+          - name: Linux (clang 15 + asan + llvm-cov)
+            os: ubuntu-22.04
+            CC: clang-15
+            CXX: clang++-15
             ERROR_ON_WARNINGS: 1
             RUN_ANALYZER: asan,llvm-cov
-          - name: Linux (clang 11 + kcov)
-            os: ubuntu-20.04
-            CC: clang-11
-            CXX: clang++-11
+          - name: Linux (clang 15 + kcov)
+            os: ubuntu-22.04
+            CC: clang-15
+            CXX: clang++-15
             ERROR_ON_WARNINGS: 1
             RUN_ANALYZER: kcov
-          - name: Linux (code-checker + valgrind)
-            os: ubuntu-20.04
+          - name: Linux (gcc 12 + code-checker + valgrind)
+            os: ubuntu-22.04
             RUN_ANALYZER: code-checker,valgrind
-          - name: macOS (xcode llvm)
-            os: macOs-latest
+          - name: macOS 14 (xcode llvm)
+            os: macos-14
+            ERROR_ON_WARNINGS: 1
+            SYSTEM_VERSION_COMPAT: 0
+          - name: macOS 13 (xcode llvm)
+            os: macos-13
             ERROR_ON_WARNINGS: 1
             SYSTEM_VERSION_COMPAT: 0
-          - name: macOS (xcode llvm + universal)
-            os: macOs-latest
+          - name: macOS 14 (xcode llvm + universal)
+            os: macos-14
             ERROR_ON_WARNINGS: 1
             SYSTEM_VERSION_COMPAT: 0
             CMAKE_DEFINES: -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64
-          - name: macOS (clang 11 + asan + llvm-cov)
-            os: macOs-latest
+          - name: macOS 15 (clang 18 + asan + llvm-cov)
+            os: macos-15-large
             CC: clang
             CXX: clang++
             ERROR_ON_WARNINGS: 1
             SYSTEM_VERSION_COMPAT: 0
             RUN_ANALYZER: asan,llvm-cov
-          - name: Windows (VS2017, 32bit)
-            os: vs2017-win2016
+          - name: Windows (old VS, 32-bit)
+            os: windows-2019
             TEST_X86: 1
           - name: Windows (latest)
             os: windows-latest
+          - name: LLVM-Mingw
+            os: windows-latest
+            TEST_MINGW: 1
+            MINGW_PKG_PREFIX: x86_64-w64-mingw32
+            MINGW_ASM_MASM_COMPILER: llvm-ml;-m64
           # The Android emulator is currently only available on macos, see:
           # https://docs.microsoft.com/en-us/azure/devops/pipelines/ecosystems/android?view=azure-devops#test-on-the-android-emulator
-          - name: Android (API 16, NDK 20)
-            os: macOs-latest
-            ANDROID_API: 16
-            ANDROID_NDK: 20.1.5948944
-          - name: Android (API 30, NDK 22)
-            os: macOs-latest
-            ANDROID_API: 30
-            ANDROID_NDK: 22.1.7171670
+          # TODO: switch to reactivecircus/android-emulator-runner, concurrently running emulators continuously fail now.
+          # - name: Android (API 31, NDK 23)
+          #   os: macos-15-large
+          #   ANDROID_API: 31
+          #   ANDROID_NDK: 23.2.8568313
+          #   ANDROID_ARCH: x86_64
+          - name: Android (API 35, NDK 27)
+            os: macos-15-large
+            ANDROID_API: 35
+            ANDROID_NDK: 27.2.12479018
+            ANDROID_ARCH: x86_64
 
     name: ${{ matrix.name }}
     runs-on: ${{ matrix.os }}
 
     env:
       TEST_X86: ${{ matrix.TEST_X86 }}
+      TEST_MINGW: ${{ matrix.TEST_MINGW }}
       ERROR_ON_WARNINGS: ${{ matrix.ERROR_ON_WARNINGS }}
       RUN_ANALYZER: ${{ matrix.RUN_ANALYZER }}
       ANDROID_API: ${{ matrix.ANDROID_API }}
       ANDROID_NDK: ${{ matrix.ANDROID_NDK }}
+      ANDROID_ARCH: ${{ matrix.ANDROID_ARCH }}
       CMAKE_DEFINES: ${{ matrix.CMAKE_DEFINES }}
       SYSTEM_VERSION_COMPAT: ${{ matrix.SYSTEM_VERSION_COMPAT }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+          cache: "pip"
 
       - name: Installing Linux Dependencies
         if: ${{ runner.os == 'Linux' && !env['TEST_X86'] }}
-        # workaround: https://github.com/actions/virtual-environments/issues/1536#issuecomment-698537248
         run: |
-          wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key 2>/dev/null | sudo apt-key add -
-          sudo add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-11 main' -y
           sudo apt update
-          sudo apt install cmake clang-11 clang-tools llvm kcov g++-10 valgrind zlib1g-dev libcurl4-openssl-dev
+          sudo apt install cmake clang-14 clang-tools llvm kcov g++-12 valgrind zlib1g-dev libcurl4-openssl-dev
 
       - name: Installing Linux 32-bit Dependencies
         if: ${{ runner.os == 'Linux' && env['TEST_X86'] }}
         run: |
           sudo dpkg --add-architecture i386
           sudo apt update
-          sudo apt install cmake gcc-multilib g++-multilib zlib1g-dev:i386 libssl-dev:i386 libcurl4-openssl-dev:i386
+          sudo apt install cmake gcc-7-multilib g++-7-multilib zlib1g-dev:i386 libssl-dev:i386 libcurl4-openssl-dev:i386
+
+        # https://github.com/actions/runner-images/issues/9491
+      - name: Decrease vm.mmap_rnd_bit to prevent ASLR ASAN issues
+        if: ${{ runner.os == 'Linux' && contains(env['RUN_ANALYZER'], 'asan') }}
+        run: sudo sysctl vm.mmap_rnd_bits=28
 
       - name: Installing CodeChecker
         if: ${{ contains(env['RUN_ANALYZER'], 'code-checker') }}
-        run: |
-          sudo apt install clang-tidy curl doxygen gcc-multilib libxml2-dev libxslt1-dev python3-dev python3-virtualenv
-          git clone https://github.com/Ericsson/CodeChecker.git --depth 1 --branch v6.15.0
-          cd CodeChecker
-          BUILD_LOGGER_64_BIT_ONLY=YES BUILD_UI_DIST=NO make standalone_package
-          echo "$PWD/build/CodeChecker/bin" >> $GITHUB_PATH
+        run: sudo snap install codechecker --classic
 
-      - name: Expose llvm PATH for Mac
+      - name: Expose llvm@15 PATH for Mac
         if: ${{ runner.os == 'macOS' }}
-        run: echo "/usr/local/opt/llvm/bin/" >> $GITHUB_PATH
-
-      - name: Installing Android SDK Dependencies
-        if: ${{ env['ANDROID_API'] }}
-        run: |
-          export ANDROID_IMAGE="system-images;android-$ANDROID_API;google_apis;x86"
-          echo "Downloading ndk;$ANDROID_NDK and $ANDROID_IMAGE"
-          echo "y" | $ANDROID_HOME/tools/bin/sdkmanager --install \
-            "ndk;$ANDROID_NDK" "$ANDROID_IMAGE" | \
-            grep -v "\[=" || true # suppress the progress bar, so we get meaningful logs
+        run: echo $(brew --prefix llvm@15)/bin >> $GITHUB_PATH
+
+      - name: Expose llvm@18 PATH for Mac
+        if: ${{ runner.os == 'macOS' && matrix.os == 'macos-15-large' && matrix.RUN_ANALYZER == 'asan,llvm-cov' }}
+        run: echo $(brew --prefix llvm@18)/bin >> $GITHUB_PATH
+
+      - name: Installing LLVM-MINGW Dependencies
+        if: ${{ runner.os == 'Windows' && env['TEST_MINGW'] }}
+        shell: powershell
+        env:
+          MINGW_PKG_PREFIX: ${{ matrix.MINGW_PKG_PREFIX }}
+          MINGW_ASM_MASM_COMPILER: ${{ matrix.MINGW_ASM_MASM_COMPILER }}
+        run: . "scripts\install-llvm-mingw.ps1"
+
+      - name: Set up zlib for Windows
+        if: ${{ runner.os == 'Windows' }}
+        shell: powershell
+        run: . "scripts\install-zlib.ps1"
 
       - name: Starting Android Simulator
         if: ${{ env['ANDROID_API'] }}
         run: bash scripts/start-android.sh
+        timeout-minutes: 20
 
       - name: Test
         shell: bash
@@ -161,9 +192,12 @@ jobs:
 
       - name: "Upload to codecov.io"
         if: ${{ contains(env['RUN_ANALYZER'], 'cov') }}
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # pin@v4.5.0
         with:
           directory: coverage
+          token: ${{ secrets.CODECOV_TOKEN }}
+          fail_ci_if_error: false
+          verbose: true
 
   archive:
     name: Create Release Archive
@@ -173,19 +207,35 @@ jobs:
     # run on master or the release branch
     if: ${{ needs.test.result == 'success' && github.event_name == 'push' }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
+      - name: Setup Java Version
+        uses: actions/setup-java@v4
+        with:
+          distribution: "temurin"
+          java-version: "17"
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@579fbbe7221704325eb4c4d4bf20c2b0859fba76 # pin@v3
+        with:
+          gradle-home-cache-cleanup: true
+
       - name: Create source archive
         run: |
           rm -rf build .c* .e* .git* scripts Makefile external/breakpad/src/tools external/breakpad/src/processor
           zip -r sentry-native.zip .
 
-      - name: Upload source artifact
-        uses: actions/upload-artifact@v2
+      - name: Build NDK artifacts
+        working-directory: ndk
+        run: ./gradlew clean distZip
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ github.sha }}
-          # When downloading artifacts, they are double-zipped:
-          # https://github.com/actions/upload-artifact#zipped-artifact-downloads
-          path: sentry-native.zip
+          if-no-files-found: error
+          path: |
+            ndk/lib/build/distributions/*.zip
+            sentry-native.zip

.github/workflows/codeql.yml

@@ -0,0 +1,67 @@
+name: 'CodeQL'
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [master]
+  schedule:
+    - cron: '17 23 * * 3'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: ['cpp', 'java']
+
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@c36620d31ac7c881962c3d9dd939c40ec9434f2b # pin@v2
+        with:
+          languages: ${{ matrix.language }}
+
+      - name: Installing Linux Dependencies
+        run: |
+          sudo apt update
+          sudo apt install cmake clang-14 clang-tools llvm kcov g++-12 valgrind zlib1g-dev libcurl4-openssl-dev
+
+      - if: matrix.language == 'java'
+        name: Setup Java Version
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
+      - if: matrix.language == 'java'
+        name: Setup Gradle
+        uses: gradle/actions/setup-gradle@bb0c460cbf5354b0cddd15bacdf0d6aaa3e5a32b # pin@v3
+        with:
+          gradle-home-cache-cleanup: true
+
+      - if: matrix.language == 'java'
+        name: Build for Android NDK
+        working-directory: ./ndk
+        run: |
+          ./gradlew compileJava
+
+      - if: matrix.language == 'cpp'
+        name: Build sentry-native
+        run: |
+          cmake -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo && cmake --build build --parallel
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@c36620d31ac7c881962c3d9dd939c40ec9434f2b # pin@v2