Skip to content

perf(android): [SDK Overhead Reduction 4] Use default timezone directly #5587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
adinauer wants to merge 2 commits into
base: perf/sdk-overhead-reduction
Choose a base branch
from
+37 −3
Draft

perf(android): [SDK Overhead Reduction 4] Use default timezone directly #5587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
093c050
perf(android): Use TimeZone.getDefault for device timezone
adinauer Jun 22, 2026
2bcedec
fix(android): Preserve locale timezone extension
adinauer Jun 23, 2026
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
8 changes: 5 additions & 3 deletions sentry-android-core/src/main/java/io/sentry/android/core/DeviceInfoUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,14 +257,16 @@ private void setDeviceIO(
@SuppressWarnings("NewApi")
@NotNull
private TimeZone getTimeZone() {
if (buildInfoProvider.getSdkInfoVersion() >= Build.VERSION_CODES.N) {
if (buildInfoProvider.getSdkInfoVersion() >= Build.VERSION_CODES.TIRAMISU) {
LocaleList locales = context.getResources().getConfiguration().getLocales();
if (!locales.isEmpty()) {
Locale locale = locales.get(0);
return Calendar.getInstance(locale).getTimeZone();
if (locale.getUnicodeLocaleType("tz") != null) {
return Calendar.getInstance(locale).getTimeZone();
}
}
}
return Calendar.getInstance().getTimeZone();
return TimeZone.getDefault();
}

@SuppressWarnings("JdkObsolete")
Expand Down
32 changes: 32 additions & 0 deletions sentry-android-core/src/test/java/io/sentry/android/core/DeviceInfoUtilTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,22 @@ package io.sentry.android.core

import android.content.Context
import android.content.Intent
import android.content.res.Configuration
import android.os.BatteryManager
import android.os.Build
import android.os.LocaleList
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import io.sentry.android.core.internal.util.CpuInfoUtils
import java.util.Locale
import java.util.TimeZone
import kotlin.test.BeforeTest
import kotlin.test.Test
import kotlin.test.assertEquals
import kotlin.test.assertNotNull
import kotlin.test.assertNull
import org.junit.runner.RunWith
import org.robolectric.annotation.Config

@RunWith(AndroidJUnit4::class)
class DeviceInfoUtilTest {
Expand Down Expand Up @@ -47,6 +53,32 @@ class DeviceInfoUtilTest {
assertNotNull(deviceInfo.memorySize)
}

@Test
fun `sets default timezone`() {
val deviceInfoUtil = DeviceInfoUtil.getInstance(context, SentryAndroidOptions())
val deviceInfo = deviceInfoUtil.collectDeviceInformation(false, false)

assertEquals(TimeZone.getDefault(), deviceInfo.timezone)
}

@Test
@Config(sdk = [Build.VERSION_CODES.TIRAMISU])
fun `preserves timezone from locale unicode extension`() {
val defaultTimeZone = TimeZone.getDefault()
try {
TimeZone.setDefault(TimeZone.getTimeZone("UTC"))
val configuration = Configuration(context.resources.configuration)
configuration.setLocales(LocaleList(Locale.forLanguageTag("en-US-u-tz-usnyc")))
val localizedContext = context.createConfigurationContext(configuration)
val deviceInfoUtil = DeviceInfoUtil(localizedContext, SentryAndroidOptions())
val deviceInfo = deviceInfoUtil.collectDeviceInformation(false, false)

assertEquals("America/New_York", deviceInfo.timezone?.id)
} finally {
TimeZone.setDefault(defaultTimeZone)
}
}

@Test
fun `does include cpu data`() {
CpuInfoUtils.getInstance().setCpuMaxFrequencies(listOf(1024))
Expand Down
Loading