Skip to content

Commit e1ada90

Browse files
markushimarkushi
authored
Merge branch 'main' into feat/anr-native-symbolication
2 parents 41407c5 + 0b8cee0 commit e1ada90

File tree

496 files changed

+13316
-5691
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

496 files changed

+13316
-5691
lines changed

‎.craft.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
minVersion: 0.29.3
22
changelogPolicy: auto
33
targets:
4-
- name: symbol-collector
5-
includeNames: /libsentry(-android)?\.so/
6-
batchType: android
7-
bundleIdPrefix: sentry-android-ndk-
84
- name: maven
95
includeNames: /^sentry.*$/
106
gradleCliPath: ./gradlew
@@ -61,3 +57,5 @@ targets:
6157
maven:io.sentry:sentry-apollo-3:
6258
maven:io.sentry:sentry-android-sqlite:
6359
maven:io.sentry:sentry-android-replay:
60+
maven:io.sentry:sentry-apollo-4:
61+
maven:io.sentry:sentry-reactor:

‎.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @adinauer @romtsn @stefanosiano @markushi
1+
* @adinauer @romtsn @stefanosiano @markushi @lcian

‎.github/ISSUE_TEMPLATE/bug_report_android.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: 🐞 Bug Report - Android
22
description: Tell us about something that's not working the way we (probably) intend.
33
labels: ["Platform: Android", "Type: Bug"]
4+
type: Bug
45
body:
56
- type: dropdown
67
id: integration

‎.github/ISSUE_TEMPLATE/bug_report_java.yml

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: 🐞 Bug Report - Java
22
description: Tell us about something that's not working the way we (probably) intend.
33
labels: ["Platform: Java", "Type: Bug"]
4+
type: Bug
45
body:
56
- type: dropdown
67
id: integration
@@ -34,6 +35,7 @@ body:
3435
- sentry-openfeign
3536
- sentry-apache-http-client-5
3637
- sentry-okhttp
38+
- sentry-reactor
3739
- other
3840
validations:
3941
required: true

‎.github/ISSUE_TEMPLATE/feature_android.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: 💡 Feature Request - Android
22
description: Tell us about a problem our SDK could solve but doesn't.
33
labels: ["Platform: Android", "Type: Feature Request"]
4+
type: Feature
45
body:
56
- type: textarea
67
id: problem

‎.github/ISSUE_TEMPLATE/feature_java.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: 💡 Feature Request - Java
22
description: Tell us about a problem our SDK could solve but doesn't.
33
labels: ["Platform: Java", "Type: Feature Request"]
4+
type: Feature
45
body:
56
- type: textarea
67
id: problem

‎.github/workflows/agp-matrix.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,14 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
agp: [ '8.0.0','8.1.4','8.2.0','8.3.0-beta01' ]
20+
agp: [ '8.7.0','8.8.0','8.9.0-beta01' ]
2121
integrations: [ true, false ]
2222

2323
name: AGP Matrix Release - AGP ${{ matrix.agp }} - Integrations ${{ matrix.integrations }}
2424
env:
2525
VERSION_AGP: ${{ matrix.agp }}
2626
APPLY_SENTRY_INTEGRATIONS: ${{ matrix.integrations }}
27+
GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
2728

2829
steps:
2930
- name: Checkout Repo
@@ -38,9 +39,10 @@ jobs:
3839
java-version: '17'
3940

4041
- name: Setup Gradle
41-
uses: gradle/actions/setup-gradle@3839b20885c2c3507be5f0521853826f4b37038a # pin@v3
42+
uses: gradle/actions/setup-gradle@aa23778d2dc6f6556fcc7164e99babbd8c3134e4 # pin@v3
4243
with:
4344
gradle-home-cache-cleanup: true
45+
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
4446

4547
- name: Setup KVM
4648
shell: bash

‎.github/workflows/build.yml

+13-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ jobs:
1414
name: Build Job ubuntu-latest - Java 17
1515
runs-on: ubuntu-latest
1616

17+
env:
18+
GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
19+
1720
steps:
1821
- name: Checkout Repo
1922
uses: actions/checkout@v4
@@ -26,16 +29,24 @@ jobs:
2629
distribution: 'temurin'
2730
java-version: '17'
2831

32+
# Workaround for https://github.com/gradle/actions/issues/21 to use config cache
33+
- name: Cache buildSrc
34+
uses: actions/cache@v4
35+
with:
36+
path: buildSrc/build
37+
key: build-logic-${{ hashFiles('buildSrc/src/**', 'buildSrc/build.gradle.kts','buildSrc/settings.gradle.kts') }}
38+
2939
- name: Setup Gradle
30-
uses: gradle/actions/setup-gradle@3839b20885c2c3507be5f0521853826f4b37038a # pin@v3
40+
uses: gradle/actions/setup-gradle@aa23778d2dc6f6556fcc7164e99babbd8c3134e4 # pin@v3
3141
with:
3242
gradle-home-cache-cleanup: true
43+
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
3344

3445
- name: Run Tests with coverage and Lint
3546
run: make preMerge
3647

3748
- name: Upload coverage to Codecov
38-
uses: codecov/codecov-action@7f8b4b4bde536c465e797be725718b88c5d95e0e # pin@v4
49+
uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # pin@v4
3950
with:
4051
name: sentry-java
4152
fail_ci_if_error: false

‎.github/workflows/codeql-analysis.yml

+7-6
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ concurrency:
1616
jobs:
1717
analyze:
1818
name: Analyze
19-
runs-on: ubuntu-latest
19+
runs-on: macos-15
2020

21-
strategy:
22-
fail-fast: false
21+
env:
22+
GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
2323

2424
steps:
2525
- name: Checkout Repo
@@ -34,12 +34,13 @@ jobs:
3434
java-version: '17'
3535

3636
- name: Setup Gradle
37-
uses: gradle/actions/setup-gradle@3839b20885c2c3507be5f0521853826f4b37038a # pin@v3
37+
uses: gradle/actions/setup-gradle@aa23778d2dc6f6556fcc7164e99babbd8c3134e4 # pin@v3
3838
with:
3939
gradle-home-cache-cleanup: true
40+
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
4041

4142
- name: Initialize CodeQL
42-
uses: github/codeql-action/init@df409f7d9260372bd5f19e5b04e83cb3c43714ae # pin@v2
43+
uses: github/codeql-action/init@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # pin@v2
4344
with:
4445
languages: 'java'
4546

@@ -48,4 +49,4 @@ jobs:
4849
./gradlew buildForCodeQL
4950
5051
- name: Perform CodeQL Analysis
51-
uses: github/codeql-action/analyze@df409f7d9260372bd5f19e5b04e83cb3c43714ae # pin@v2
52+
uses: github/codeql-action/analyze@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # pin@v2

‎.github/workflows/enforce-license-compliance.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Setup Gradle
14-
uses: gradle/actions/setup-gradle@3839b20885c2c3507be5f0521853826f4b37038a # pin@v3
14+
uses: gradle/actions/setup-gradle@aa23778d2dc6f6556fcc7164e99babbd8c3134e4 # pin@v3
1515
with:
1616
gradle-home-cache-cleanup: true
1717

‎.github/workflows/generate-javadocs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
java-version: '17'
2121

2222
- name: Setup Gradle
23-
uses: gradle/actions/setup-gradle@3839b20885c2c3507be5f0521853826f4b37038a # pin@v3
23+
uses: gradle/actions/setup-gradle@aa23778d2dc6f6556fcc7164e99babbd8c3134e4 # pin@v3
2424
with:
2525
gradle-home-cache-cleanup: true
2626

‎.github/workflows/gradle-wrapper-validation.yml

-16
This file was deleted.

‎.github/workflows/integration-tests-benchmarks.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
# we copy the secret to the env variable in order to access it in the workflow
2424
env:
2525
SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
26+
GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
2627

2728
steps:
2829
- name: Git checkout
@@ -37,9 +38,10 @@ jobs:
3738
java-version: '17'
3839

3940
- name: Setup Gradle
40-
uses: gradle/actions/setup-gradle@3839b20885c2c3507be5f0521853826f4b37038a # pin@v3
41+
uses: gradle/actions/setup-gradle@aa23778d2dc6f6556fcc7164e99babbd8c3134e4 # pin@v3
4142
with:
4243
gradle-home-cache-cleanup: true
44+
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
4345

4446
# Clean, build and release a test apk, but only if we will run the benchmark
4547
- name: Make assembleBenchmarks
@@ -72,6 +74,7 @@ jobs:
7274
# we copy the secret to the env variable in order to access it in the workflow
7375
env:
7476
SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
77+
GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
7578

7679
steps:
7780
- name: Git checkout
@@ -86,9 +89,10 @@ jobs:
8689
java-version: '17'
8790

8891
- name: Setup Gradle
89-
uses: gradle/actions/setup-gradle@3839b20885c2c3507be5f0521853826f4b37038a # pin@v3
92+
uses: gradle/actions/setup-gradle@aa23778d2dc6f6556fcc7164e99babbd8c3134e4 # pin@v3
9093
with:
9194
gradle-home-cache-cleanup: true
95+
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
9296

9397
- uses: actions/cache@v4
9498
id: app-plain-cache

‎.github/workflows/integration-tests-ui-critical.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ jobs:
2121
build:
2222
name: Build
2323
runs-on: ubuntu-latest
24+
25+
env:
26+
GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
27+
2428
steps:
2529
- name: Checkout code
2630
uses: actions/checkout@v4
@@ -32,9 +36,10 @@ jobs:
3236
java-version: '17'
3337

3438
- name: Setup Gradle
35-
uses: gradle/actions/setup-gradle@3839b20885c2c3507be5f0521853826f4b37038a # pin@v3
39+
uses: gradle/actions/setup-gradle@aa23778d2dc6f6556fcc7164e99babbd8c3134e4 # pin@v3
3640
with:
3741
gradle-home-cache-cleanup: true
42+
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
3843

3944
- name: Build debug APK
4045
run: make assembleUiTestCriticalRelease

‎.github/workflows/integration-tests-ui.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ jobs:
1818
env:
1919
SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
2020
SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
21+
GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
2122

2223
steps:
2324
- name: Git checkout
@@ -32,9 +33,10 @@ jobs:
3233
java-version: '17'
3334

3435
- name: Setup Gradle
35-
uses: gradle/actions/setup-gradle@3839b20885c2c3507be5f0521853826f4b37038a # pin@v3
36+
uses: gradle/actions/setup-gradle@aa23778d2dc6f6556fcc7164e99babbd8c3134e4 # pin@v3
3637
with:
3738
gradle-home-cache-cleanup: true
39+
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
3840

3941
# Clean, build and release a test apk, but only if we will run the benchmark
4042
- name: Make assembleUiTests

‎.github/workflows/release-build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
java-version: '17'
2727

2828
- name: Setup Gradle
29-
uses: gradle/actions/setup-gradle@3839b20885c2c3507be5f0521853826f4b37038a # pin@v3
29+
uses: gradle/actions/setup-gradle@aa23778d2dc6f6556fcc7164e99babbd8c3134e4 # pin@v3
3030
with:
3131
gradle-home-cache-cleanup: true
3232

‎.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
- name: Get auth token
2121
id: token
22-
uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.0
22+
uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5
2323
with:
2424
app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
2525
private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}

‎.github/workflows/system-tests-backend.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jobs:
1616
continue-on-error: true
1717
env:
1818
SENTRY_URL: http://127.0.0.1:8000
19+
GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
1920
strategy:
2021
fail-fast: false
2122
matrix:
@@ -56,9 +57,10 @@ jobs:
5657
java-version: '17'
5758

5859
- name: Setup Gradle
59-
uses: gradle/actions/setup-gradle@3839b20885c2c3507be5f0521853826f4b37038a # pin@v3
60+
uses: gradle/actions/setup-gradle@aa23778d2dc6f6556fcc7164e99babbd8c3134e4 # pin@v3
6061
with:
6162
gradle-home-cache-cleanup: true
63+
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
6264

6365
- name: Exclude android modules from build
6466
run: |
@@ -99,7 +101,7 @@ jobs:
99101
100102
- name: Start server and run integration test for sentry-cli commands
101103
run: |
102-
test/system-test-run.sh "${{ matrix.sample }}" "${{ matrix.agent }}" "${{ matrix.agent-auto-init }}"
104+
test/system-test-run.sh "${{ matrix.sample }}" "${{ matrix.agent }}" "${{ matrix.agent-auto-init }}" "0"
103105
104106
- name: Upload test results
105107
if: always()

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@ distributions/
2020
sentry-spring-boot-starter-jakarta/src/main/resources/META-INF/spring.factories
2121
sentry-samples/sentry-samples-spring-boot-jakarta/spy.log
2222
spy.log
23+
buildSrc/.kotlin/

0 commit comments

Comments
 (0)