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

Updates to internal emitter #659

Merged
merged 5 commits into from Jan 25, 2024
Merged

Updates to internal emitter #659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
39e5b09
Update Emitter constructor to accept namespace and event store and ma…
matus-tomlein Jan 18, 2024
26380a7
Change default emit timeout from 5 seconds to 30 seconds (close #658)
matus-tomlein Jan 18, 2024
593f513
Fix returning error from network connection requests
matus-tomlein Jan 18, 2024
36d4c7a
Remove unused threadCount property from Tracker
matus-tomlein Jan 18, 2024
af97608
Set default thread count in Executor to match the default thread pool…
matus-tomlein Jan 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 3 additions & 6 deletions .../src/androidTest/java/com/snowplowanalytics/snowplow/internal/tracker/StateManagerTest.kt
View file
Open in desktop
Expand Up @@ -120,8 +120,7 @@ class StateManagerTest {
fun testScreenStateMachine() {
val context = InstrumentationRegistry.getInstrumentation().targetContext
val eventStore = MockEventStore()
val builder = { emitter: Emitter -> emitter.eventStore = eventStore }
val emitter = Emitter(context, "http://snowplow-fake-url.com", builder)
val emitter = Emitter("namespace", eventStore, context, "http://snowplow-fake-url.com")
val trackerBuilder = { tracker: Tracker ->
tracker.screenContext = true
tracker.sessionContext = false
Expand Down Expand Up @@ -216,8 +215,7 @@ class StateManagerTest {
fun testLifecycleStateMachine() {
val context = InstrumentationRegistry.getInstrumentation().targetContext
val eventStore = MockEventStore()
val builder = { emitter: Emitter -> emitter.eventStore = eventStore }
val emitter = Emitter(context, "http://snowplow-fake-url.com", builder)
val emitter = Emitter("namespace", eventStore, context, "http://snowplow-fake-url.com")
val trackerBuilder = { tracker: Tracker ->
tracker.lifecycleAutotracking = true
tracker.base64Encoded = false
Expand Down Expand Up @@ -290,8 +288,7 @@ class StateManagerTest {
fun testDeepLinkStateMachine() {
val context = InstrumentationRegistry.getInstrumentation().targetContext
val eventStore = MockEventStore()
val builder = { emitter: Emitter -> emitter.eventStore = eventStore }
val emitter = Emitter(context, "http://snowplow-fake-url.com", builder)
val emitter = Emitter("namespace", eventStore, context, "http://snowplow-fake-url.com")
val trackerBuilder = { tracker: Tracker ->
tracker.deepLinkContext = true
tracker.base64Encoded = false
Expand Down
40 changes: 16 additions & 24 deletions ...acker/src/androidTest/java/com/snowplowanalytics/snowplow/internal/tracker/TrackerTest.kt
View file
Open in desktop
Expand Up @@ -57,13 +57,9 @@ class TrackerTest {

val emitter = Companion.tracker!!.emitter
val eventStore = emitter.eventStore
if (eventStore != null) {
val isClean = eventStore.removeAllEvents()
Log.i("TrackerTest", "EventStore cleaned: $isClean")
Log.i("TrackerTest", "Events in the store: " + eventStore.size())
} else {
Log.i("TrackerTest", "EventStore null")
}
val isClean = eventStore.removeAllEvents()
Log.i("TrackerTest", "EventStore cleaned: $isClean")
Log.i("TrackerTest", "Events in the store: " + eventStore.size())
emitter.shutdown(30)
Companion.tracker!!.close()
Log.i("TrackerTest", "Tracker closed")
Expand All @@ -85,7 +81,7 @@ class TrackerTest {
emitter.emptyLimit = 0
}
val emitter = Emitter(
context, "testUrl", builder
"myNamespace", null, context, "testUrl", builder
)
val subject = Subject(
context, null
Expand All @@ -95,7 +91,6 @@ class TrackerTest {
tracker.platform = DevicePlatform.InternetOfThings
tracker.base64Encoded = false
tracker.logLevel = LogLevel.VERBOSE
tracker.threadCount = 1
tracker.sessionContext = false
tracker.platformContextEnabled = false
tracker.geoLocationContext = false
Expand Down Expand Up @@ -125,7 +120,6 @@ class TrackerTest {
Assert.assertNotNull(tracker.emitter)
Assert.assertNotNull(tracker.subject)
Assert.assertEquals(LogLevel.VERBOSE, tracker.logLevel)
Assert.assertEquals(2, tracker.threadCount.toLong())
Assert.assertFalse(tracker.exceptionAutotracking)
Assert.assertTrue(tracker.lifecycleAutotracking)
Assert.assertTrue(tracker.installAutotracking)
Expand All @@ -136,7 +130,7 @@ class TrackerTest {
fun testEmitterUpdate() {
val tracker = tracker
Assert.assertNotNull(tracker!!.emitter)
tracker.emitter = Emitter(context, "test", null)
tracker.emitter = Emitter(tracker.namespace, null, context, "test", null)
Assert.assertNotNull(tracker.emitter)
}

Expand Down Expand Up @@ -193,7 +187,7 @@ class TrackerTest {
emitterArg.requestSecurity = Protocol.HTTP
}
try {
emitter = Emitter(context, getMockServerURI(mockWebServer)!!, builder)
emitter = Emitter(namespace, null, context, getMockServerURI(mockWebServer)!!, builder)
} catch (e: Exception) {
e.printStackTrace()
Assert.fail("Exception on Emitter creation")
Expand All @@ -211,10 +205,8 @@ class TrackerTest {
Companion.tracker =
Tracker(emitter!!, namespace, "testTrackWithNoContext", null, context, trackerBuilder)
val eventStore = emitter.eventStore
if (eventStore != null) {
val isClean = eventStore.removeAllEvents()
Log.i("testTrackSelfDescribingEvent", "EventStore clean: $isClean")
}
val isClean = eventStore.removeAllEvents()
Log.i("testTrackSelfDescribingEvent", "EventStore clean: $isClean")
Log.i("testTrackSelfDescribingEvent", "Send SelfDescribing event")
val sdj = SelfDescribingJson("iglu:foo/bar/jsonschema/1-0-0")
val sdEvent = SelfDescribing(sdj)
Expand Down Expand Up @@ -255,7 +247,7 @@ class TrackerTest {
emitterArg.requestSecurity = Protocol.HTTP
}
try {
emitter = Emitter(context, getMockServerURI(mockWebServer)!!, emitterBuilder)
emitter = Emitter(namespace, null, context, getMockServerURI(mockWebServer)!!, emitterBuilder)
} catch (e: Exception) {
e.printStackTrace()
Assert.fail("Exception on Emitter creation")
Expand Down Expand Up @@ -313,7 +305,7 @@ class TrackerTest {
val mockWebServer = getMockServer(1)
val builder = { emitter: Emitter -> emitter.bufferOption = BufferOption.Single }
val emitter = Emitter(
context, getMockServerURI(mockWebServer)!!, builder
namespace, null, context, getMockServerURI(mockWebServer)!!, builder
)
val trackerBuilder = { tracker: Tracker ->
tracker.base64Encoded = false
Expand All @@ -330,7 +322,7 @@ class TrackerTest {
val eventId = Companion.tracker!!.track(ScreenView("name"))
Assert.assertNull(eventId)
val req = mockWebServer.takeRequest(2, TimeUnit.SECONDS)
Assert.assertEquals(0, Companion.tracker!!.emitter.eventStore!!.size())
Assert.assertEquals(0, Companion.tracker!!.emitter.eventStore.size())
Assert.assertNull(req)
mockWebServer.shutdown()
}
Expand All @@ -345,7 +337,7 @@ class TrackerTest {
val mockWebServer = getMockServer(1)
val builder = { emitter: Emitter -> emitter.bufferOption = BufferOption.Single }
val emitter = Emitter(
context, getMockServerURI(mockWebServer)!!, builder
namespace, null, context, getMockServerURI(mockWebServer)!!, builder
)
val trackerBuilder = { tracker: Tracker ->
tracker.base64Encoded = false
Expand Down Expand Up @@ -373,7 +365,7 @@ class TrackerTest {
TestUtils.createSessionSharedPreferences(context, namespace)
val builder = { emitter: Emitter -> emitter.bufferOption = BufferOption.Single }
val emitter = Emitter(
context, "fake-uri", builder
namespace, null, context, "fake-uri", builder
)
val trackerBuilder = { tracker: Tracker ->
tracker.base64Encoded = false
Expand Down Expand Up @@ -422,7 +414,7 @@ class TrackerTest {
Thread.getDefaultUncaughtExceptionHandler().javaClass
)
val emitter = Emitter(
context, "com.acme", null
namespace, null, context, "com.acme", null
)
val trackerBuilder = { tracker: Tracker ->
tracker.base64Encoded = false
Expand Down Expand Up @@ -450,7 +442,7 @@ class TrackerTest {
Thread.getDefaultUncaughtExceptionHandler().javaClass
)
val emitter = Emitter(
context, "com.acme", null
namespace, null, context, "com.acme", null
)
val trackerBuilder = { tracker: Tracker ->
tracker.base64Encoded = false
Expand All @@ -475,7 +467,7 @@ class TrackerTest {
@Test
fun testStartsNewSessionWhenChangingAnonymousTracking() {
val emitterBuilder = { emitter: Emitter -> emitter.bufferOption = BufferOption.Single }
val emitter = Emitter(context, "fake-uri", emitterBuilder)
val emitter = Emitter("ns", null, context, "fake-uri", emitterBuilder)
emitter.pauseEmit()

val trackerBuilder = { tracker: Tracker ->
Expand Down