Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/agp-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-tests-benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-tests-size.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-tests-ui-critical.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/spring-boot-2-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/spring-boot-3-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/spring-boot-4-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -490,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!!
Expand All @@ -501,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())) {
Expand Down
Loading