Merge branch 'main' into rz/chore/7.x.x-changelog

Author: romtsn

.craft.yml

@@ -1,10 +1,6 @@
 minVersion: 0.29.3
 changelogPolicy: auto
 targets:
-  - name: symbol-collector
-    includeNames: /libsentry(-android)?\.so/
-    batchType: android
-    bundleIdPrefix: sentry-android-ndk-
   - name: maven
     includeNames: /^sentry.*$/
     gradleCliPath: ./gradlew
@@ -37,17 +33,21 @@ targets:
       maven:io.sentry:sentry-android-core:
       maven:io.sentry:sentry-android-ndk:
       maven:io.sentry:sentry-android-timber:
-      maven:io.sentry:sentry-android-okhttp:
       maven:io.sentry:sentry-kotlin-extensions:
       maven:io.sentry:sentry-android-fragment:
       maven:io.sentry:sentry-bom:
       maven:io.sentry:sentry-openfeign:
       maven:io.sentry:sentry-opentelemetry-agent:
       maven:io.sentry:sentry-opentelemetry-agentcustomization:
+      maven:io.sentry:sentry-opentelemetry-agentless:
+      maven:io.sentry:sentry-opentelemetry-agentless-spring:
+      maven:io.sentry:sentry-opentelemetry-bootstrap:
       maven:io.sentry:sentry-opentelemetry-core:
       maven:io.sentry:sentry-apollo:
       maven:io.sentry:sentry-jdbc:
       maven:io.sentry:sentry-graphql:
+      maven:io.sentry:sentry-graphql-22:
+      maven:io.sentry:sentry-graphql-core:
       maven:io.sentry:sentry-quartz:
       maven:io.sentry:sentry-okhttp:
       maven:io.sentry:sentry-android-navigation:
@@ -57,3 +57,5 @@ targets:
       maven:io.sentry:sentry-apollo-3:
       maven:io.sentry:sentry-android-sqlite:
       maven:io.sentry:sentry-android-replay:
+      maven:io.sentry:sentry-apollo-4:
+      maven:io.sentry:sentry-reactor:

.github/CODEOWNERS

@@ -1 +1 @@
-*       @adinauer @romtsn @stefanosiano @markushi
+*       @adinauer @romtsn @stefanosiano @markushi @lcian

.github/ISSUE_TEMPLATE/bug_report_android.yml

@@ -1,6 +1,7 @@
 name: 🐞 Bug Report - Android
 description: Tell us about something that's not working the way we (probably) intend.
 labels: ["Platform: Android", "Type: Bug"]
+type: Bug
 body:
   - type: dropdown
     id: integration
@@ -10,13 +11,13 @@ body:
       options:
         - sentry-android
         - sentry-android-ndk
-        - sentry-android-okhttp
         - sentry-android-timber
         - sentry-android-fragment
         - sentry-android-sqlite
         - sentry-apollo
-        - sentry-compose
         - sentry-apollo-3
+        - sentry-compose
+        - sentry-okhttp
         - other
     validations:
       required: true

.github/ISSUE_TEMPLATE/bug_report_java.yml

@@ -1,6 +1,7 @@
 name: 🐞 Bug Report - Java
 description: Tell us about something that's not working the way we (probably) intend.
 labels: ["Platform: Java", "Type: Bug"]
+type: Bug
 body:
   - type: dropdown
     id: integration
@@ -15,6 +16,8 @@ body:
         - sentry-apollo-3
         - sentry-kotlin-extensions
         - sentry-opentelemetry-agent
+        - sentry-opentelemetry-agentless
+        - sentry-opentelemetry-agentless-spring
         - sentry-opentelemetry-core
         - sentry-servlet
         - sentry-servlet-jakarta
@@ -27,10 +30,12 @@ body:
         - sentry-logback
         - sentry-log4j2
         - sentry-graphql
+        - sentry-graphql-22
         - sentry-quartz
         - sentry-openfeign
         - sentry-apache-http-client-5
         - sentry-okhttp
+        - sentry-reactor
         - other
     validations:
       required: true

.github/ISSUE_TEMPLATE/feature_android.yml

@@ -1,6 +1,7 @@
 name: 💡 Feature Request - Android
 description: Tell us about a problem our SDK could solve but doesn't.
 labels: ["Platform: Android", "Type: Feature Request"]
+type: Feature
 body:
   - type: textarea
     id: problem

.github/ISSUE_TEMPLATE/feature_java.yml

@@ -1,6 +1,7 @@
 name: 💡 Feature Request - Java
 description: Tell us about a problem our SDK could solve but doesn't.
 labels: ["Platform: Java", "Type: Feature Request"]
+type: Feature
 body:
   - type: textarea
     id: problem

.github/workflows/agp-matrix.yml

@@ -17,13 +17,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        agp: [ '8.0.0','8.1.4','8.2.0','8.3.0-beta01' ]
+        agp: [ '8.7.0','8.8.0','8.9.0-beta01' ]
         integrations: [ true, false ]
 
     name: AGP Matrix Release - AGP ${{ matrix.agp }} - Integrations ${{ matrix.integrations }}
     env:
       VERSION_AGP: ${{ matrix.agp }}
       APPLY_SENTRY_INTEGRATIONS: ${{ matrix.integrations }}
+      GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
     steps:
       - name: Checkout Repo
@@ -38,9 +39,10 @@ jobs:
           java-version: '17'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@3839b20885c2c3507be5f0521853826f4b37038a # pin@v3
+        uses: gradle/actions/setup-gradle@4a417b5b1a01db0b076987546b67f8de18e7d340 # pin@v3
         with:
           gradle-home-cache-cleanup: true
+          cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
       - name: Setup KVM
         shell: bash

.github/workflows/build.yml

@@ -14,6 +14,9 @@ jobs:
     name: Build Job ubuntu-latest - Java 17
     runs-on: ubuntu-latest
 
+    env:
+      GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
+
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4
@@ -26,16 +29,24 @@ jobs:
           distribution: 'temurin'
           java-version: '17'
 
+      # Workaround for https://github.com/gradle/actions/issues/21 to use config cache
+      - name: Cache buildSrc
+        uses: actions/cache@v4
+        with:
+          path: buildSrc/build
+          key: build-logic-${{ hashFiles('buildSrc/src/**', 'buildSrc/build.gradle.kts','buildSrc/settings.gradle.kts') }}
+
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@3839b20885c2c3507be5f0521853826f4b37038a # pin@v3
+        uses: gradle/actions/setup-gradle@4a417b5b1a01db0b076987546b67f8de18e7d340 # pin@v3
         with:
           gradle-home-cache-cleanup: true
+          cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
       - name: Run Tests with coverage and Lint
         run: make preMerge
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@015f24e6818733317a2da2edd6290ab26238649a # pin@v4
+        uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # pin@v4
         with:
           name: sentry-java
           fail_ci_if_error: false

.github/workflows/codeql-analysis.yml

@@ -16,12 +16,10 @@ concurrency:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-latest
+    runs-on: macos-15
 
-    strategy:
-      fail-fast: false
-      matrix:
-        language: ['cpp', 'java']
+    env:
+      GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
     steps:
       - name: Checkout Repo
@@ -36,23 +34,19 @@ jobs:
           java-version: '17'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@3839b20885c2c3507be5f0521853826f4b37038a # pin@v3
+        uses: gradle/actions/setup-gradle@4a417b5b1a01db0b076987546b67f8de18e7d340 # pin@v3
         with:
           gradle-home-cache-cleanup: true
+          cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@df409f7d9260372bd5f19e5b04e83cb3c43714ae # pin@v2
+        uses: github/codeql-action/init@6bb031afdd8eb862ea3fc1848194185e076637e5 # pin@v2
         with:
-          languages: ${{ matrix.language }}
+          languages: 'java'
 
-      - if: matrix.language == 'cpp'
-        name: Build Cpp
-        run: |
-          ./gradlew sentry-android-ndk:buildCMakeRelWithDebInfo
-      - if: matrix.language == 'java'
-        name: Build Java
+      - name: Build Java
         run: |
           ./gradlew buildForCodeQL
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@df409f7d9260372bd5f19e5b04e83cb3c43714ae # pin@v2
+        uses: github/codeql-action/analyze@6bb031afdd8eb862ea3fc1848194185e076637e5 # pin@v2

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

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@3839b20885c2c3507be5f0521853826f4b37038a # pin@v3
+        uses: gradle/actions/setup-gradle@4a417b5b1a01db0b076987546b67f8de18e7d340 # pin@v3
         with:
           gradle-home-cache-cleanup: true