Skip to content
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

Jump to bottom

Migrate thermal states to OTel #821

Merged
merged 11 commits into from
May 13, 2024
Merged

Migrate thermal states to OTel #821

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
95a0e9e
Added thermal state data source
leandro-godon May 6, 2024
affe785
Renamed ThermalStatusDataSource to ThermalStateDataSource
leandro-godon May 7, 2024
6ec5852
Added test
leandro-godon May 8, 2024
e26d494
Merge branch 'master' into leandro/thermal_states
leandro-godon May 8, 2024
d370521
Remove listener when disabling the data source.
leandro-godon May 8, 2024
f9b73cc
Put the feature behind the beta features flag.
leandro-godon May 8, 2024
e1b9158
Detekt fix.
leandro-godon May 8, 2024
29be5e2
Cosmetic change
leandro-godon May 8, 2024
cd954cc
Merge branch 'master' into leandro/thermal_states
leandro-godon May 9, 2024
c960621
Merge branch 'master' into leandro/thermal_states
leandro-godon May 13, 2024
ad20aaa
Merge branch 'master' into leandro/thermal_states
leandro-godon May 13, 2024
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
Prev Previous commit
Next Next commit
Renamed ThermalStatusDataSource to ThermalStateDataSource
  • Loading branch information
@leandro-godon
leandro-godon committed May 7, 2024
commit affe7851c2b87e3a4d88cc45dbddfff4fd9179f4
2 changes: 1 addition & 1 deletion ...e/thermalstate/ThermalStatusDataSource.kt → ...re/thermalstate/ThermalStateDataSource.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import io.embrace.android.embracesdk.worker.TaskPriority
import java.util.concurrent.Executor

@RequiresApi(Build.VERSION_CODES.Q)
internal class ThermalStatusDataSource(
internal class ThermalStateDataSource(
spanService: SpanService,
logger: InternalEmbraceLogger,
private val backgroundWorker: BackgroundWorker,
Expand Down
10 changes: 5 additions & 5 deletions ...ace-android-sdk/src/main/java/io/embrace/android/embracesdk/injection/DataSourceModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import io.embrace.android.embracesdk.capture.crumbs.WebViewUrlDataSource
import io.embrace.android.embracesdk.capture.memory.MemoryWarningDataSource
import io.embrace.android.embracesdk.capture.powersave.LowPowerDataSource
import io.embrace.android.embracesdk.capture.session.SessionPropertiesDataSource
import io.embrace.android.embracesdk.capture.thermalstate.ThermalStatusDataSource
import io.embrace.android.embracesdk.capture.thermalstate.ThermalStateDataSource
import io.embrace.android.embracesdk.internal.utils.BuildVersionChecker
import io.embrace.android.embracesdk.internal.utils.Provider
import io.embrace.android.embracesdk.worker.WorkerName
Expand Down Expand Up @@ -49,7 +49,7 @@ internal interface DataSourceModule {
val memoryWarningDataSource: DataSourceState<MemoryWarningDataSource>
val networkStatusDataSource: DataSourceState<NetworkStatusDataSource>
val sigquitDataSource: DataSourceState<SigquitDataSource>
val thermalStatusDataSource: DataSourceState<ThermalStatusDataSource>?
val thermalStateDataSource: DataSourceState<ThermalStateDataSource>?
}

internal class DataSourceModuleImpl(
Expand Down Expand Up @@ -213,16 +213,16 @@ internal class DataSourceModuleImpl(
)
}

override val thermalStatusDataSource: DataSourceState<ThermalStatusDataSource>? by dataSourceState {
override val thermalStateDataSource: DataSourceState<ThermalStateDataSource>? by dataSourceState {
DataSourceState(
factory = { thermalService },
configGate = { configService.autoDataCaptureBehavior.isThermalStatusCaptureEnabled() }
)
}

private val thermalService: ThermalStatusDataSource? by singleton {
private val thermalService: ThermalStateDataSource? by singleton {
if (BuildVersionChecker.isAtLeast(Build.VERSION_CODES.Q)) {
ThermalStatusDataSource(
ThermalStateDataSource(
spanService = otelModule.spanService,
logger = initModule.logger,
backgroundWorker = workerThreadModule.backgroundWorker(WorkerName.BACKGROUND_REGISTRATION),
Expand Down
8 changes: 4 additions & 4 deletions ...embracesdk/ThermalStatusDataSourceTest.kt → .../embracesdk/ThermalStateDataSourceTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package io.embrace.android.embracesdk

import android.os.PowerManager
import io.embrace.android.embracesdk.arch.schema.EmbType
import io.embrace.android.embracesdk.capture.thermalstate.ThermalStatusDataSource
import io.embrace.android.embracesdk.capture.thermalstate.ThermalStateDataSource
import io.embrace.android.embracesdk.concurrency.BlockableExecutorService
import io.embrace.android.embracesdk.fakes.FakeClock
import io.embrace.android.embracesdk.fakes.FakeSpanService
Expand All @@ -13,15 +13,15 @@ import org.junit.Assert.assertEquals
import org.junit.Before
import org.junit.Test

internal class ThermalStatusDataSourceTest {
internal class ThermalStateDataSourceTest {

private lateinit var dataSource: ThermalStatusDataSource
private lateinit var dataSource: ThermalStateDataSource
private lateinit var spanWriter: FakeSpanService

@Before
fun setUp() {
spanWriter = FakeSpanService()
dataSource = ThermalStatusDataSource(
dataSource = ThermalStateDataSource(
spanWriter,
InternalEmbraceLogger(),
BackgroundWorker(BlockableExecutorService()),
Expand Down
2 changes: 1 addition & 1 deletion ...oid-sdk/src/test/java/io/embrace/android/embracesdk/injection/DataSourceModuleImplTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ internal class DataSourceModuleImplTest {
assertNotNull(module.memoryWarningDataSource)
assertNotNull(module.networkStatusDataSource)
assertNotNull(module.sigquitDataSource)
assertNotNull(module.thermalStatusDataSource)
assertNotNull(module.thermalStateDataSource)
assertEquals(12, module.getDataSources().size)
}
}