-
-
Notifications
You must be signed in to change notification settings - Fork 435
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '8.x.x' into feat/spring-boot-autoconfig-for-otel-no-agent
- Loading branch information
Showing
143 changed files
with
2,004 additions
and
554 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| # This is used by the action https://github.com/dorny/paths-filter | ||
|
|
||
| high_risk_code: &high_risk_code | ||
| # Transport classes | ||
| - "sentry/src/main/java/io/sentry/transport/AsyncHttpTransport.java" | ||
| - "sentry/src/main/java/io/sentry/transport/HttpConnection.java" | ||
| - "sentry/src/main/java/io/sentry/transport/QueuedThreadPoolExecutor.java" | ||
| - "sentry/src/main/java/io/sentry/transport/RateLimiter.java" | ||
| - "sentry-apache-http-client-5/src/main/java/io/sentry/transport/apache/ApacheHttpClientTransport.java" | ||
|
|
||
| # Class used by hybrid SDKs | ||
| - "sentry-android-core/src/main/java/io/sentry/android/core/InternalSentrySdk.java" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| name: Changes In High Risk Code | ||
| on: | ||
| pull_request: | ||
|
|
||
| # https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value | ||
| concurrency: | ||
| group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} | ||
| cancel-in-progress: true | ||
|
|
||
| jobs: | ||
| files-changed: | ||
| name: Detect changed files | ||
| runs-on: ubuntu-latest | ||
| # Map a step output to a job output | ||
| outputs: | ||
| high_risk_code: ${{ steps.changes.outputs.high_risk_code }} | ||
| high_risk_code_files: ${{ steps.changes.outputs.high_risk_code_files }} | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - name: Get changed files | ||
| id: changes | ||
| uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2 | ||
| with: | ||
| token: ${{ github.token }} | ||
| filters: .github/file-filters.yml | ||
|
|
||
| # Enable listing of files matching each filter. | ||
| # Paths to files will be available in `${FILTER_NAME}_files` output variable. | ||
| list-files: csv | ||
|
|
||
| validate-high-risk-code: | ||
| if: needs.files-changed.outputs.high_risk_code == 'true' | ||
| needs: files-changed | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Comment on PR to notify of changes in high risk files | ||
| uses: actions/github-script@v7 | ||
| env: | ||
| high_risk_code: ${{ needs.files-changed.outputs.high_risk_code_files }} | ||
| with: | ||
| script: | | ||
| const highRiskFiles = process.env.high_risk_code; | ||
| const fileList = highRiskFiles.split(',').map(file => `- [ ] ${file}`).join('\n'); | ||
| github.rest.issues.createComment({ | ||
| issue_number: context.issue.number, | ||
| owner: context.repo.owner, | ||
| repo: context.repo.repo, | ||
| body: `### 🚨 Detected changes in high risk code 🚨 \n High-risk code has higher potential to break the SDK and may be hard to test. To prevent severe bugs, apply the rollout process for releasing such changes and be extra careful when changing and reviewing these files:\n ${fileList}` | ||
| }) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,15 +20,15 @@ jobs: | |
| java-version: '17' | ||
|
|
||
| - name: Setup Gradle | ||
| uses: gradle/actions/setup-gradle@0d30c9111cf47a838eb69c06d13f3f51ab2ed76f # pin@v3 | ||
| uses: gradle/actions/setup-gradle@bb0c460cbf5354b0cddd15bacdf0d6aaa3e5a32b # pin@v3 | ||
| with: | ||
| gradle-home-cache-cleanup: true | ||
|
|
||
| - name: Generate Aggregate Javadocs | ||
| run: | | ||
| ./gradlew aggregateJavadocs | ||
| - name: Deploy | ||
| uses: JamesIves/github-pages-deploy-action@920cbb300dcd3f0568dbc42700c61e2fd9e6139c # [email protected].4 | ||
| uses: JamesIves/github-pages-deploy-action@881db5376404c5c8d621010bcbec0310b58d5e29 # [email protected].8 | ||
| with: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| BRANCH: gh-pages | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,128 @@ | ||
| name: UI Tests Critical | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - main | ||
| pull_request: | ||
|
|
||
| concurrency: | ||
| group: ${{ github.workflow }}-${{ github.ref }} | ||
| cancel-in-progress: true | ||
|
|
||
| env: | ||
| BASE_PATH: "sentry-android-integration-tests/sentry-uitest-android-critical" | ||
| BUILD_PATH: "build/outputs/apk/release" | ||
| APK_NAME: "sentry-uitest-android-critical-release.apk" | ||
| APK_ARTIFACT_NAME: "sentry-uitest-android-critical-release" | ||
| MAESTRO_VERSION: "1.39.0" | ||
|
|
||
| jobs: | ||
| build: | ||
| name: Build | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout code | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Set up Java 17 | ||
| uses: actions/setup-java@v4 | ||
| with: | ||
| distribution: 'temurin' | ||
| java-version: '17' | ||
|
|
||
| - name: Setup Gradle | ||
| uses: gradle/actions/setup-gradle@bb0c460cbf5354b0cddd15bacdf0d6aaa3e5a32b # pin@v3 | ||
| with: | ||
| gradle-home-cache-cleanup: true | ||
|
|
||
| - name: Build debug APK | ||
| run: make assembleUiTestCriticalRelease | ||
|
|
||
| - name: Upload APK artifact | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: ${{env.APK_ARTIFACT_NAME}} | ||
| path: "${{env.BASE_PATH}}/${{env.BUILD_PATH}}/${{env.APK_NAME}}" | ||
| retention-days: 1 | ||
|
|
||
| run-maestro-tests: | ||
| name: Run Tests for API Level ${{ matrix.api-level }} | ||
| needs: build | ||
| runs-on: ubuntu-latest | ||
| strategy: | ||
| # we want that the matrix keeps running, default is to cancel them if it fails. | ||
| fail-fast: false | ||
| matrix: | ||
| include: | ||
| - api-level: 30 # Android 11 | ||
| target: aosp_atd | ||
| channel: canary # Necessary for ATDs | ||
| arch: x86_64 | ||
| - api-level: 31 # Android 12 | ||
| target: aosp_atd | ||
| channel: canary # Necessary for ATDs | ||
| arch: x86_64 | ||
| - api-level: 33 # Android 13 | ||
| target: aosp_atd | ||
| channel: canary # Necessary for ATDs | ||
| arch: x86_64 | ||
| - api-level: 34 # Android 14 | ||
| target: aosp_atd | ||
| channel: canary # Necessary for ATDs | ||
| arch: x86_64 | ||
| steps: | ||
| - name: Checkout code | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: Setup KVM | ||
| shell: bash | ||
| run: | | ||
| # check if virtualization is supported... | ||
| sudo apt install -y --no-install-recommends cpu-checker coreutils && echo "CPUs=$(nproc --all)" && kvm-ok | ||
| # allow access to KVM to run the emulator | ||
| echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' \ | ||
| | sudo tee /etc/udev/rules.d/99-kvm4all.rules | ||
| sudo udevadm control --reload-rules | ||
| sudo udevadm trigger --name-match=kvm | ||
| - name: Download APK artifact | ||
| uses: actions/download-artifact@v4 | ||
| with: | ||
| name: ${{env.APK_ARTIFACT_NAME}} | ||
|
|
||
| - name: Install Maestro | ||
| uses: dniHze/maestro-test-action@bda8a93211c86d0a05b7a4597c5ad134566fbde4 # [email protected] | ||
| with: | ||
| version: ${{env.MAESTRO_VERSION}} | ||
|
|
||
| - name: Run tests | ||
| uses: reactivecircus/android-emulator-runner@62dbb605bba737720e10b196cb4220d374026a6d # [email protected] | ||
| with: | ||
| api-level: ${{ matrix.api-level }} | ||
| force-avd-creation: false | ||
| disable-animations: true | ||
| disable-spellchecker: true | ||
| target: ${{ matrix.target }} | ||
| channel: ${{ matrix.channel }} | ||
| arch: ${{ matrix.arch }} | ||
| emulator-options: > | ||
| -no-window | ||
| -no-snapshot-save | ||
| -gpu swiftshader_indirect | ||
| -noaudio | ||
| -no-boot-anim | ||
| -camera-back none | ||
| -camera-front none | ||
| -timezone US/Pacific | ||
| script: | | ||
| adb install -r -d "${{env.APK_NAME}}" | ||
| maestro test "${{env.BASE_PATH}}/maestro" --debug-output "${{env.BASE_PATH}}/maestro-logs" | ||
| - name: Upload Maestro test results | ||
| if: failure() | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: maestro-logs | ||
| path: "${{env.BASE_PATH}}/maestro-logs" | ||
| retention-days: 1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.