-
Notifications
You must be signed in to change notification settings - Fork 37
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Moving InitializationEvents to the common api * Adding auto service dependency * Making SdkInitializationEvents a service * Moving InitializationEvents to the agent * Connecting StartupInstrumentation with SdkInitializationEvents * Adding tests * Adding tests * Making InitializationEvents internal * Removing autoService from java lib conventions
- Loading branch information
1 parent
4b2181e
commit 2bba3d7
Showing
15 changed files
with
267 additions
and
106 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
80 changes: 80 additions & 0 deletions
80
...nt/src/main/java/io/opentelemetry/android/internal/initialization/InitializationEvents.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| /* | ||
| * Copyright The OpenTelemetry Authors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package io.opentelemetry.android.internal.initialization | ||
|
|
||
| import io.opentelemetry.android.config.OtelRumConfig | ||
| import io.opentelemetry.sdk.trace.export.SpanExporter | ||
| import java.util.ServiceLoader.load | ||
|
|
||
| /** | ||
| * This class is internal and not for public use. Its APIs are unstable and can change at any time. | ||
| */ | ||
| interface InitializationEvents { | ||
| fun sdkInitializationStarted() | ||
|
|
||
| fun recordConfiguration(config: OtelRumConfig) | ||
|
|
||
| fun currentNetworkProviderInitialized() | ||
|
|
||
| fun networkMonitorInitialized() | ||
|
|
||
| fun anrMonitorInitialized() | ||
|
|
||
| fun slowRenderingDetectorInitialized() | ||
|
|
||
| fun crashReportingInitialized() | ||
|
|
||
| fun spanExporterInitialized(spanExporter: SpanExporter) | ||
|
|
||
| companion object { | ||
| private var instance: InitializationEvents? = null | ||
|
|
||
| @JvmStatic | ||
| fun get(): InitializationEvents { | ||
| if (instance == null) { | ||
| val initializationEvents = load(InitializationEvents::class.java).firstOrNull() | ||
| if (initializationEvents != null) { | ||
| set(initializationEvents) | ||
| } else { | ||
| set(NO_OP) | ||
| } | ||
| } | ||
|
|
||
| return instance!! | ||
| } | ||
|
|
||
| @JvmStatic | ||
| fun set(initializationEvents: InitializationEvents) { | ||
| if (instance == null) { | ||
| instance = initializationEvents | ||
| } | ||
| } | ||
|
|
||
| @JvmStatic | ||
| fun resetForTest() { | ||
| instance = null | ||
| } | ||
|
|
||
| val NO_OP: InitializationEvents = | ||
| object : InitializationEvents { | ||
| override fun sdkInitializationStarted() {} | ||
|
|
||
| override fun recordConfiguration(config: OtelRumConfig) {} | ||
|
|
||
| override fun currentNetworkProviderInitialized() {} | ||
|
|
||
| override fun networkMonitorInitialized() {} | ||
|
|
||
| override fun anrMonitorInitialized() {} | ||
|
|
||
| override fun slowRenderingDetectorInitialized() {} | ||
|
|
||
| override fun crashReportingInitialized() {} | ||
|
|
||
| override fun spanExporterInitialized(spanExporter: SpanExporter) {} | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
...rc/test/java/io/opentelemetry/android/internal/initialization/InitializationEventsTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| /* | ||
| * Copyright The OpenTelemetry Authors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package io.opentelemetry.android.internal.initialization | ||
|
|
||
| import io.mockk.mockk | ||
| import org.assertj.core.api.Assertions.assertThat | ||
| import org.junit.jupiter.api.AfterEach | ||
| import org.junit.jupiter.api.Test | ||
|
|
||
| class InitializationEventsTest { | ||
| @AfterEach | ||
| fun tearDown() { | ||
| InitializationEvents.resetForTest() | ||
| } | ||
|
|
||
| @Test | ||
| fun `Verify service loading`() { | ||
| val initializationEvents = InitializationEvents.get() | ||
| assertThat(initializationEvents).isInstanceOf(TestInitializationEvents::class.java) | ||
| } | ||
|
|
||
| @Test | ||
| fun `Verify setting instance once`() { | ||
| val initializationEvents = mockk<InitializationEvents>() | ||
| InitializationEvents.set(initializationEvents) | ||
|
|
||
| assertThat(InitializationEvents.get()).isEqualTo(initializationEvents) | ||
| } | ||
| } |
35 changes: 35 additions & 0 deletions
35
...rc/test/java/io/opentelemetry/android/internal/initialization/TestInitializationEvents.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| /* | ||
| * Copyright The OpenTelemetry Authors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package io.opentelemetry.android.internal.initialization | ||
|
|
||
| import io.opentelemetry.android.config.OtelRumConfig | ||
| import io.opentelemetry.sdk.trace.export.SpanExporter | ||
|
|
||
| class TestInitializationEvents : InitializationEvents { | ||
| override fun sdkInitializationStarted() { | ||
| } | ||
|
|
||
| override fun recordConfiguration(config: OtelRumConfig) { | ||
| } | ||
|
|
||
| override fun currentNetworkProviderInitialized() { | ||
| } | ||
|
|
||
| override fun networkMonitorInitialized() { | ||
| } | ||
|
|
||
| override fun anrMonitorInitialized() { | ||
| } | ||
|
|
||
| override fun slowRenderingDetectorInitialized() { | ||
| } | ||
|
|
||
| override fun crashReportingInitialized() { | ||
| } | ||
|
|
||
| override fun spanExporterInitialized(spanExporter: SpanExporter) { | ||
| } | ||
| } |
1 change: 1 addition & 0 deletions
1
...s/META-INF/services/io.opentelemetry.android.internal.initialization.InitializationEvents
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| io.opentelemetry.android.internal.initialization.TestInitializationEvents |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 0 additions & 48 deletions
48
...up/src/main/java/io/opentelemetry/android/instrumentation/startup/InitializationEvents.kt
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.