Merge branch 'main' into feat/tombstone_native_sdk_merge

supervacuus · web-flow · commit 7d73c41e7311 · 2026-01-27T14:13:42.000+01:00
diff --git a/.github/workflows/agp-matrix.yml b/.github/workflows/agp-matrix.yml
@@ -50,7 +50,7 @@ jobs:
           sudo udevadm trigger --name-match=kvm
 
       - name: AVD cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         id: avd-cache
         with:
           path: |
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -31,7 +31,7 @@ jobs:
 
       # Workaround for https://github.com/gradle/actions/issues/21 to use config cache
       - name: Cache buildSrc
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: buildSrc/build
           key: build-logic-${{ hashFiles('buildSrc/src/**', 'buildSrc/build.gradle.kts','buildSrc/settings.gradle.kts') }}
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -36,7 +36,7 @@ jobs:
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # pin@v2
+        uses: github/codeql-action/init@19b2f06db2b6f5108140aeb04014ef02b648f789 # pin@v2
         with:
           languages: 'java'
 
@@ -45,4 +45,4 @@ jobs:
           ./gradlew buildForCodeQL --no-build-cache
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # pin@v2
+        uses: github/codeql-action/analyze@19b2f06db2b6f5108140aeb04014ef02b648f789 # pin@v2
diff --git a/.github/workflows/integration-tests-benchmarks.yml b/.github/workflows/integration-tests-benchmarks.yml
@@ -92,7 +92,7 @@ jobs:
         with:
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
-      - uses: actions/cache@v4
+      - uses: actions/cache@v5
         id: app-plain-cache
         with:
           path: sentry-android-integration-tests/test-app-plain/build/outputs/apk/release/test-app-plain-release.apk
diff --git a/.github/workflows/integration-tests-size.yml b/.github/workflows/integration-tests-size.yml
@@ -30,7 +30,7 @@ jobs:
 
       # Workaround for https://github.com/gradle/actions/issues/21 to use config cache
       - name: Cache buildSrc
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: buildSrc/build
           key: build-logic-${{ hashFiles('buildSrc/src/**', 'buildSrc/build.gradle.kts','buildSrc/settings.gradle.kts') }}
diff --git a/.github/workflows/integration-tests-ui-critical.yml b/.github/workflows/integration-tests-ui-critical.yml
@@ -90,7 +90,7 @@ jobs:
           sudo udevadm trigger --name-match=kvm
 
       - name: AVD cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         id: avd-cache
         with:
           path: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -34,7 +34,7 @@ jobs:
           fetch-depth: 0
           submodules: 'recursive'
       - name: Prepare release
-        uses: getsentry/craft@c6e2f04939b6ee67030588afbb5af76b127d8203 # v2
+        uses: getsentry/craft@fd370d4d54bec9ff07f909d88a3c4aec6f0ba22b # v2
         env:
           GITHUB_TOKEN: ${{ steps.token.outputs.token }}
         with:
diff --git a/.github/workflows/spring-boot-2-matrix.yml b/.github/workflows/spring-boot-2-matrix.yml
@@ -50,7 +50,7 @@ jobs:
 
       # Workaround for https://github.com/gradle/actions/issues/21 to use config cache
       - name: Cache buildSrc
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: buildSrc/build
           key: build-logic-${{ hashFiles('buildSrc/src/**', 'buildSrc/build.gradle.kts','buildSrc/settings.gradle.kts') }}
diff --git a/.github/workflows/spring-boot-3-matrix.yml b/.github/workflows/spring-boot-3-matrix.yml
@@ -50,7 +50,7 @@ jobs:
 
       # Workaround for https://github.com/gradle/actions/issues/21 to use config cache
       - name: Cache buildSrc
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: buildSrc/build
           key: build-logic-${{ hashFiles('buildSrc/src/**', 'buildSrc/build.gradle.kts','buildSrc/settings.gradle.kts') }}
diff --git a/.github/workflows/spring-boot-4-matrix.yml b/.github/workflows/spring-boot-4-matrix.yml
@@ -50,7 +50,7 @@ jobs:
 
       # Workaround for https://github.com/gradle/actions/issues/21 to use config cache
       - name: Cache buildSrc
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: buildSrc/build
           key: build-logic-${{ hashFiles('buildSrc/src/**', 'buildSrc/build.gradle.kts','buildSrc/settings.gradle.kts') }}
diff --git a/.github/workflows/update-deps.yml b/.github/workflows/update-deps.yml
@@ -9,21 +9,27 @@ on:
     branches:
       - main
 
+permissions:
+  contents: write
+  pull-requests: write
+  actions: write
+
 jobs:
   native:
-    uses: getsentry/github-workflows/.github/workflows/updater.yml@v2
-    with:
-      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.
-      api-token: ${{ secrets.CI_DEPLOY_KEY }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: getsentry/github-workflows/updater@v3
+        with:
+          path: scripts/update-sentry-native-ndk.sh
+          name: Native SDK
+          ssh-key: ${{ secrets.CI_DEPLOY_KEY }}
 
   gradle-wrapper:
-    uses: getsentry/github-workflows/.github/workflows/updater.yml@v2
-    with:
-      path: scripts/update-gradle.sh
-      name: Gradle
-      pattern: '^v[0-9.]+$' # only match non-preview versions
-    secrets:
-      api-token: ${{ secrets.CI_DEPLOY_KEY }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: getsentry/github-workflows/updater@v3
+        with:
+          path: scripts/update-gradle.sh
+          name: Gradle
+          pattern: '^v[0-9.]+$' # only match non-preview versions
+          ssh-key: ${{ secrets.CI_DEPLOY_KEY }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,12 @@
 - Establish new native exception mechanisms to differentiate events generated by `sentry-native` from `ApplicationExitInfo`. ([#5052](https://github.com/getsentry/sentry-java/pull/5052))
 - Set `write` permission for `statuses` in the changelog preview GHA workflow. ([#5053](https://github.com/getsentry/sentry-java/pull/5053))
 
+### Dependencies
+
+- Bump Native SDK from v0.12.3 to v0.12.4 ([#5061](https://github.com/getsentry/sentry-java/pull/5061))
+  - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0124)
+  - [diff](https://github.com/getsentry/sentry-native/compare/0.12.3...0.12.4)
+
 ## 8.31.0
 
 ### Features
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -147,7 +147,7 @@ quartz = { module = "org.quartz-scheduler:quartz", version = "2.3.0" }
 reactor-core = { module = "io.projectreactor:reactor-core", version = "3.5.3" }
 retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
 retrofit-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" }
-sentry-native-ndk = { module = "io.sentry:sentry-native-ndk", version = "0.12.3" }
+sentry-native-ndk = { module = "io.sentry:sentry-native-ndk", version = "0.12.4" }
 servlet-api = { module = "javax.servlet:javax.servlet-api", version = "3.1.0" }
 servlet-jakarta-api = { module = "jakarta.servlet:jakarta.servlet-api", version = "6.1.0" }
 slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
diff --git a/requirements.txt b/requirements.txt
@@ -2,4 +2,4 @@ certifi==2025.7.14
 charset-normalizer==3.4.2
 idna==3.10
 requests==2.32.4
-urllib3==2.6.0
+urllib3==2.6.3
diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/DefaultAndroidEventProcessor.java b/sentry-android-core/src/main/java/io/sentry/android/core/DefaultAndroidEventProcessor.java
@@ -37,7 +37,7 @@ final class DefaultAndroidEventProcessor implements EventProcessor {
 
   private final @NotNull BuildInfoProvider buildInfoProvider;
   private final @NotNull SentryAndroidOptions options;
-  private final @Nullable Future<DeviceInfoUtil> deviceInfoUtil;
+  @TestOnly final @Nullable Future<DeviceInfoUtil> deviceInfoUtil;
   private final @NotNull LazyEvaluator<String> deviceFamily =
       new LazyEvaluator<>(() -> ContextUtils.getFamily(NoOpLogger.getInstance()));
 
diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/internal/util/CpuInfoUtils.java b/sentry-android-core/src/main/java/io/sentry/android/core/internal/util/CpuInfoUtils.java
@@ -75,12 +75,16 @@ String getSystemCpuPath() {
 
   @TestOnly
   public void setCpuMaxFrequencies(List<Integer> frequencies) {
-    cpuMaxFrequenciesMhz.clear();
-    cpuMaxFrequenciesMhz.addAll(frequencies);
+    try (final @NotNull ISentryLifecycleToken ignored = lock.acquire()) {
+      cpuMaxFrequenciesMhz.clear();
+      cpuMaxFrequenciesMhz.addAll(frequencies);
+    }
   }
 
   @TestOnly
-  final void clear() {
-    cpuMaxFrequenciesMhz.clear();
+  public void clear() {
+    try (final @NotNull ISentryLifecycleToken ignored = lock.acquire()) {
+      cpuMaxFrequenciesMhz.clear();
+    }
   }
 }
diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/DefaultAndroidEventProcessorTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/DefaultAndroidEventProcessorTest.kt
@@ -87,6 +87,7 @@ class DefaultAndroidEventProcessorTest {
     context = ApplicationProvider.getApplicationContext()
     AppState.getInstance().resetInstance()
     DeviceInfoUtil.resetInstance()
+    CpuInfoUtils.getInstance().clear()
   }
 
   @Test
@@ -489,6 +490,7 @@ class DefaultAndroidEventProcessorTest {
   @Test
   fun `Event sets no device cpu info when there is none provided`() {
     val sut = fixture.getSut(context)
+    sut.deviceInfoUtil?.get()
     CpuInfoUtils.getInstance().setCpuMaxFrequencies(emptyList())
     assertNotNull(sut.process(SentryEvent(), Hint())) {
       val device = it.contexts.device!!
@@ -500,6 +502,7 @@ class DefaultAndroidEventProcessorTest {
   @Test
   fun `Event sets rights device cpu info when there is one provided`() {
     val sut = fixture.getSut(context)
+    sut.deviceInfoUtil?.get()
     CpuInfoUtils.getInstance().setCpuMaxFrequencies(listOf(800, 900))
 
     assertNotNull(sut.process(SentryEvent(), Hint())) {
