Cherry pick commit a54c179afefe38966a651902017d51918b728cf9,replace t…

…hrowing exception with ignoring events for LibraryAdapter

commit_hash:942ed48d4f3c036ea0af4f6ec721eed0db43f257

analytics/src/main/java/io/appmetrica/analytics/impl/events/LibraryEventConstructor.kt

@@ -6,19 +6,20 @@ import io.appmetrica.analytics.impl.protobuf.backend.EventProto
 class LibraryEventConstructor {
 
     private val systemEventName = "appmetrica_system_event_42"
+    private val nullPlaceholder = "null"
 
     fun constructEvent(
-        sender: String,
-        event: String,
-        payload: String
+        sender: String?,
+        event: String?,
+        payload: String?
     ): ModuleEvent {
         return ModuleEvent.newBuilder(EventProto.ReportMessage.Session.Event.EVENT_CLIENT)
             .withName(systemEventName)
             .withAttributes(
                 mapOf(
-                    "sender" to sender,
-                    "event" to event,
-                    "payload" to payload,
+                    "sender" to (sender ?: nullPlaceholder),
+                    "event" to (event ?: nullPlaceholder),
+                    "payload" to (payload ?: nullPlaceholder),
                 )
             )
             .build()

analytics/src/main/java/io/appmetrica/analytics/impl/proxy/AppMetricaLibraryAdapterProxy.kt

@@ -8,6 +8,8 @@ import io.appmetrica.analytics.impl.events.LibraryEventConstructor
 import io.appmetrica.analytics.impl.proxy.synchronous.LibraryAdapterSynchronousStageExecutor
 import io.appmetrica.analytics.impl.proxy.validation.LibraryAdapterBarrier
 import io.appmetrica.analytics.logger.appmetrica.internal.DebugLogger
+import io.appmetrica.analytics.logger.appmetrica.internal.ImportantLogger
+import io.appmetrica.analytics.logger.appmetrica.internal.PublicLogger
 
 class AppMetricaLibraryAdapterProxy {
 
@@ -22,24 +24,31 @@ class AppMetricaLibraryAdapterProxy {
         ClientServiceLocator.getInstance().clientExecutorProvider.defaultExecutor
 
     fun activate(context: Context) {
-        DebugLogger.info(tag, "Activate")
-        barrier.activate(context)
-        val applicationContext = context.applicationContext
-        synchronousStageExecutor.activate(applicationContext)
-        executor.execute {
-            DebugLogger.info(tag, "Activate full")
-            provider.getInitializedImpl(applicationContext).activateFull()
+        if (barrier.activate(context)) {
+            DebugLogger.info(tag, "Activate")
+            val applicationContext = context.applicationContext
+            synchronousStageExecutor.activate(applicationContext)
+            executor.execute {
+                provider.getInitializedImpl(applicationContext).activateFull()
+            }
+            provider.markActivated()
+        } else {
+            ImportantLogger.info(tag, "Activation failed due to context is null")
         }
-        provider.markActivated()
     }
 
     fun reportEvent(
-        sender: String,
-        event: String,
-        payload: String
+        sender: String?,
+        event: String?,
+        payload: String?
     ) {
-        barrier.reportEvent(sender, event, payload)
-        synchronousStageExecutor.reportEvent(sender, event, payload)
-        ModulesFacade.reportEvent(libraryEventConstructor.constructEvent(sender, event, payload))
+        if (barrier.reportEvent(sender, event, payload)) {
+            synchronousStageExecutor.reportEvent(sender, event, payload)
+            ModulesFacade.reportEvent(libraryEventConstructor.constructEvent(sender, event, payload))
+        } else {
+            val message = "Failed report event from sender: $sender with name = $event and payload = $payload"
+            PublicLogger.getAnonymousInstance().warning("$tag$message")
+            DebugLogger.warning(tag, message)
+        }
     }
 }

analytics/src/main/java/io/appmetrica/analytics/impl/proxy/synchronous/LibraryAdapterSynchronousStageExecutor.kt

@@ -27,8 +27,8 @@ class LibraryAdapterSynchronousStageExecutor(
     }
 
     fun reportEvent(
-        sender: String,
-        event: String,
-        payload: String
+        sender: String?,
+        event: String?,
+        payload: String?
     ) {}
 }

analytics/src/main/java/io/appmetrica/analytics/impl/proxy/validation/LibraryAdapterBarrier.kt

@@ -3,38 +3,27 @@ package io.appmetrica.analytics.impl.proxy.validation
 import android.content.Context
 import io.appmetrica.analytics.impl.proxy.AppMetricaFacadeProvider
 import io.appmetrica.analytics.impl.utils.validation.NonNullValidator
-import io.appmetrica.analytics.impl.utils.validation.ThrowIfFailedValidator
 
 class LibraryAdapterBarrier(
     provider: AppMetricaFacadeProvider,
 ) {
 
-    private val contextValidator = ThrowIfFailedValidator(
-        NonNullValidator<Context>("Context")
-    )
-    private val activationValidator = ActivationValidator(provider)
-    private val senderValidator = ThrowIfFailedValidator(
-        NonNullValidator<String>("Sender")
-    )
-    private val eventValidator = ThrowIfFailedValidator(
-        NonNullValidator<String>("Event")
-    )
-    private val payloadValidator = ThrowIfFailedValidator(
-        NonNullValidator<String>("Payload")
-    )
+    private val contextValidator = NonNullValidator<Context>("Context")
+    private val activationValidator = SilentActivationValidator(provider)
+    private val senderValidator = NonNullValidator<String>("Sender")
+    private val eventValidator = NonNullValidator<String>("Event")
+    private val payloadValidator = NonNullValidator<String>("Payload")
 
-    fun activate(context: Context?) {
-        contextValidator.validate(context)
-    }
+    fun activate(context: Context?): Boolean = contextValidator.validate(context).isValid
 
     fun reportEvent(
         sender: String?,
         event: String?,
         payload: String?
-    ) {
-        activationValidator.validate()
-        senderValidator.validate(sender)
-        eventValidator.validate(event)
-        payloadValidator.validate(payload)
+    ): Boolean {
+        return activationValidator.validate().isValid &&
+            senderValidator.validate(sender).isValid &&
+            eventValidator.validate(event).isValid &&
+            payloadValidator.validate(payload).isValid
     }
 }

analytics/src/test/java/io/appmetrica/analytics/impl/events/LibraryEventConstructorTest.kt

@@ -35,4 +35,26 @@ class LibraryEventConstructorTest : CommonTest() {
             }
             .checkAll()
     }
+
+    @Test
+    fun `constructEvent for null values`() {
+        val moduleEvent = constructor.constructEvent(null, null, null)
+
+        ObjectPropertyAssertions(moduleEvent)
+            .withPrivateFields(true)
+            .checkField("type", EventProto.ReportMessage.Session.Event.EVENT_CLIENT)
+            .checkField("name", "appmetrica_system_event_42")
+            .checkFieldIsNull("value")
+            .checkField("serviceDataReporterType", 1)
+            .checkFieldIsNull("environment")
+            .checkFieldIsNull("extras")
+            .checkFieldRecursively<List<Map.Entry<String, Any>>>("attributes") {
+                assertThat(it.actual).containsExactlyInAnyOrderElementsOf(mapOf(
+                    "sender" to "null",
+                    "event" to "null",
+                    "payload" to "null",
+                ).entries.toList())
+            }
+            .checkAll()
+    }
 }

analytics/src/test/java/io/appmetrica/analytics/impl/proxy/AppMetricaLibraryAdapterProxyTest.kt

@@ -16,10 +16,14 @@ import io.appmetrica.analytics.testutils.staticRule
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
+import org.mockito.MockedStatic
+import org.mockito.kotlin.any
 import org.mockito.kotlin.argumentCaptor
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
+import org.mockito.kotlin.never
 import org.mockito.kotlin.verify
+import org.mockito.kotlin.verifyNoInteractions
 import org.mockito.kotlin.whenever
 
 class AppMetricaLibraryAdapterProxyTest : CommonTest() {
@@ -64,6 +68,8 @@ class AppMetricaLibraryAdapterProxyTest : CommonTest() {
         proxy = AppMetricaLibraryAdapterProxy()
 
         barrier = barrierRule.constructionMock.constructed().first()
+        whenever(barrier.activate(any())).thenReturn(true)
+        whenever(barrier.reportEvent(any(), any(), any())).thenReturn(true)
         synchronousStageExecutor =
             synchronousStageExecutorRule.constructionMock.constructed().first()
         libraryEventConstructor =
@@ -82,6 +88,13 @@ class AppMetricaLibraryAdapterProxyTest : CommonTest() {
         verify(facade).activateFull()
     }
 
+    @Test
+    fun `activate if not valid`() {
+        whenever(barrier.activate(context)).thenReturn(false)
+        proxy.activate(context)
+        verifyNoInteractions(synchronousStageExecutor, executor)
+    }
+
     @Test
     fun reportEvent() {
         val sender = "sender_value"
@@ -99,4 +112,16 @@ class AppMetricaLibraryAdapterProxyTest : CommonTest() {
             ModulesFacade.reportEvent(moduleEvent)
         }
     }
+
+    @Test
+    fun `reportEvent if not valid`() {
+        val sender = "sender_value"
+        val event = "event_value"
+        val payload = "payload_value"
+
+        whenever(barrier.reportEvent(sender, event, payload)).thenReturn(false)
+        proxy.reportEvent(sender, event, payload)
+        verifyNoInteractions(synchronousStageExecutor)
+        modulesFacadeRule.staticMock.verify({ ModulesFacade.reportEvent(any()) }, never())
+    }
 }

analytics/src/test/java/io/appmetrica/analytics/impl/proxy/validation/LibraryAdapterBarrierTest.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import io.appmetrica.analytics.ValidationException
 import io.appmetrica.analytics.impl.proxy.AppMetricaFacadeProvider
 import io.appmetrica.analytics.testutils.CommonTest
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.Before
 import org.junit.Test
 import org.mockito.kotlin.mock
@@ -24,37 +25,36 @@ class LibraryAdapterBarrierTest : CommonTest() {
 
     @Test
     fun activate() {
-        barrier.activate(context)
+        assertThat(barrier.activate(context)).isTrue()
     }
 
-    @Test(expected = ValidationException::class)
+    @Test
     fun `activate for null context`() {
-        barrier.activate(null)
+        assertThat(barrier.activate(null)).isFalse()
     }
 
     @Test
     fun reportEvent() {
-        barrier.reportEvent("sender", "event", "payload")
+        assertThat(barrier.reportEvent("sender", "event", "payload")).isTrue()
     }
 
-    @Test(expected = ValidationException::class)
+    @Test
     fun `reportEvent for null sender`() {
-        barrier.reportEvent(null, "event", "payload")
+        assertThat(barrier.reportEvent(null, "event", "payload")).isFalse()
     }
 
-    @Test(expected = ValidationException::class)
+    @Test
     fun `reportEvent for null event`() {
-        barrier.reportEvent("sender", null, "payload")
+        assertThat(barrier.reportEvent("sender", null, "payload")).isFalse()
     }
 
-    @Test(expected = ValidationException::class)
     fun `reportEvent for null payload`() {
-        barrier.reportEvent("sender", "event", null)
+        assertThat(barrier.reportEvent("sender", "event", null)).isFalse()
     }
 
-    @Test(expected = ValidationException::class)
+    @Test
     fun `reportEvent if not activated`() {
         whenever(appMetricaFacadeProvider.isActivated).thenReturn(false)
-        barrier.reportEvent("sender", "event", "payload")
+        assertThat(barrier.reportEvent("sender", "event", "payload")).isFalse()
     }
 }