Merge pull request #3363 from getsentry/8.x.x

8.x.x
getsentry · Jan 9, 2025 · bfbaf37 · bfbaf37
2 parents eb7afff + 5f07d96
commit bfbaf37
Show file tree

Hide file tree

Showing 876 changed files with 31,298 additions and 15,234 deletions.
diff --git a/.craft.yml b/.craft.yml
@@ -37,17 +37,20 @@ 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-core:
+#      maven:io.sentry:sentry-opentelemetry-agentless:
+#      maven:io.sentry:sentry-opentelemetry-agentless-spring:
       maven:io.sentry:sentry-apollo:
       maven:io.sentry:sentry-jdbc:
       maven:io.sentry:sentry-graphql:
+#      maven:io.sentry:sentry-graphql-core:
+#      maven:io.sentry:sentry-graphql-22:
       maven:io.sentry:sentry-quartz:
       maven:io.sentry:sentry-okhttp:
       maven:io.sentry:sentry-android-navigation:

diff --git a/.github/ISSUE_TEMPLATE/bug_report_android.yml b/.github/ISSUE_TEMPLATE/bug_report_android.yml
@@ -10,13 +10,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

diff --git a/.github/ISSUE_TEMPLATE/bug_report_java.yml b/.github/ISSUE_TEMPLATE/bug_report_java.yml
@@ -15,6 +15,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,6 +29,7 @@ body:
         - sentry-logback
         - sentry-log4j2
         - sentry-graphql
+        - sentry-graphql-22
         - sentry-quartz
         - sentry-openfeign
         - sentry-apache-http-client-5

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -20,8 +20,6 @@ jobs:
 
     strategy:
       fail-fast: false
-      matrix:
-        language: ['cpp', 'java']
 
     steps:
       - name: Checkout Repo
@@ -45,12 +43,7 @@ jobs:
         with:
           languages: ${{ matrix.language }}
 
-      - 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
 

diff --git a/.github/workflows/system-tests-backend.yml b/.github/workflows/system-tests-backend.yml
@@ -20,10 +20,26 @@ jobs:
       fail-fast: false
       matrix:
         sample: [ "sentry-samples-spring-boot-jakarta" ]
+        agent: [ "0" ]
+        agent-auto-init: [ "true" ]
         include:
           - sample: "sentry-samples-spring-boot"
+          - sample: "sentry-samples-spring-boot-opentelemetry-noagent"
+          - sample: "sentry-samples-spring-boot-opentelemetry"
+            agent: "1"
+            agent-auto-init: "true"
+          - sample: "sentry-samples-spring-boot-opentelemetry"
+            agent: "1"
+            agent-auto-init: "false"
           - sample: "sentry-samples-spring-boot-webflux-jakarta"
           - sample: "sentry-samples-spring-boot-webflux"
+          - sample: "sentry-samples-spring-boot-jakarta-opentelemetry-noagent"
+          - sample: "sentry-samples-spring-boot-jakarta-opentelemetry"
+            agent: "1"
+            agent-auto-init: "true"
+          - sample: "sentry-samples-spring-boot-jakarta-opentelemetry"
+            agent: "1"
+            agent-auto-init: "false"
     steps:
       - uses: actions/checkout@v4
         with:
@@ -53,7 +69,6 @@ jobs:
             -e '/.*"sentry-android-core",/d' \
             -e '/.*"sentry-android-fragment",/d' \
             -e '/.*"sentry-android-navigation",/d' \
-            -e '/.*"sentry-android-okhttp",/d' \
             -e '/.*"sentry-android-sqlite",/d' \
             -e '/.*"sentry-android-timber",/d' \
             -e '/.*"sentry-android-integration-tests:sentry-uitest-android-benchmark",/d' \
@@ -78,20 +93,19 @@ jobs:
         run: |
           ./gradlew :sentry-samples:${{ matrix.sample }}:bootJar
 
+      - name: Build agent jar
+        run: |
+          ./gradlew :sentry-opentelemetry:sentry-opentelemetry-agent:assemble
+
       - name: Start server and run integration test for sentry-cli commands
         run: |
-          test/system-test-sentry-server-start.sh \
-            > sentry-mock-server.txt 2>&1 & \
-          test/system-test-spring-server-start.sh "${{ matrix.sample }}" \
-            > spring-server.txt 2>&1 & \
-          test/wait-for-spring.sh && \
-          ./gradlew :sentry-samples:${{ matrix.sample }}:systemTest
+          test/system-test-run.sh "${{ matrix.sample }}" "${{ matrix.agent }}" "${{ matrix.agent-auto-init }}"
 
       - name: Upload test results
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: test-results-${{ matrix.sample }}-system-test
+          name: test-results-${{ matrix.sample }}-${{ matrix.agent }}-${{ matrix.agent-auto-init }}-system-test
           path: |
             **/build/reports/*
             sentry-mock-server.txt

diff --git a/.github/workflows/update-deps.yml b/.github/workflows/update-deps.yml
@@ -13,7 +13,7 @@ jobs:
   native:
     uses: getsentry/github-workflows/.github/workflows/updater.yml@v2
     with:
-      path: sentry-android-ndk/sentry-native
+      path: scripts/update-sentry-native-ndk.sh
       name: Native SDK
     secrets:
       # If a custom token is used instead, a CI would be triggered on a created PR.

diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "sentry-android-ndk/sentry-native"]
-	path = sentry-android-ndk/sentry-native
-	url = https://github.com/getsentry/sentry-native