From 2521fe77fdc195ec133ded918245ea0f70740a13 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Jan 2026 10:05:49 +0000 Subject: [PATCH 1/2] build(deps): bump github/codeql-action from 4.31.10 to 4.31.11 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.31.10 to 4.31.11. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/cdefb33c0f6224e58673d9004f47f7cb3e328b89...19b2f06db2b6f5108140aeb04014ef02b648f789) --- updated-dependencies: - dependency-name: github/codeql-action dependency-version: 4.31.11 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 8e1d911f28..97ebbb228d 100644 --- 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 From 4f76aa514e3f6ab0cc8780a846fd2e7d676aafc1 Mon Sep 17 00:00:00 2001 From: Roman Zavarnitsyn Date: Mon, 26 Jan 2026 14:04:27 +0100 Subject: [PATCH 2/2] Fix race condition when clearing cpu info utils in tests --- .../android/core/internal/util/CpuInfoUtils.java | 12 ++++++++---- .../android/core/DefaultAndroidEventProcessorTest.kt | 1 + 2 files changed, 9 insertions(+), 4 deletions(-) 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 index c289a9c06a..ae94f410da 100644 --- 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 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 index 2810cb3b00..2263d9662a 100644 --- 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