Add logs

Author: karlenDimla

pir/pir-impl/src/main/java/com/duckduckgo/pir/impl/common/PirJobConstants.kt

@@ -22,4 +22,5 @@ object PirJobConstants {
     const val MAX_DETACHED_WEBVIEW_COUNT = 20
     const val SCHEDULED_SCAN_INTERVAL_HOURS = 12L
     const val EMAIL_CONFIRMATION_INTERVAL_HOURS = 8L
+    const val CUSTOM_PIXEL_INTERVAL_HOURS = 5L
 }

pir/pir-impl/src/main/java/com/duckduckgo/pir/impl/pixels/OptOut24HourSubmissionSuccessRateReporter.kt

@@ -20,6 +20,7 @@ import com.duckduckgo.common.utils.CurrentTimeProvider
 import com.duckduckgo.di.scopes.AppScope
 import com.duckduckgo.pir.impl.store.PirRepository
 import com.squareup.anvil.annotations.ContributesBinding
+import logcat.logcat
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 import kotlin.math.abs
@@ -36,10 +37,12 @@ class RealOptOut24HourSubmissionSuccessRateReporter @Inject constructor(
     private val pirPixelSender: PirPixelSender,
 ) : OptOut24HourSubmissionSuccessRateReporter {
     override suspend fun attemptFirePixel() {
+        logcat { "PIR-CUSTOM-STATS: Attempt to fire 24hour submission pixels" }
         val startDate = pirRepository.getCustomStatsPixelsLastSentMs()
         val now = currentTimeProvider.currentTimeMillis()
 
         if (shouldFirePixel(startDate, now)) {
+            logcat { "PIR-CUSTOM-STATS: Should fire pixel - 24hrs passed since last send" }
             val endDate = now - TimeUnit.HOURS.toMillis(24)
             val activeBrokers = pirRepository.getAllActiveBrokerObjects()
             val hasUserProfiles = pirRepository.getAllUserProfileQueries().isNotEmpty()
@@ -52,6 +55,7 @@ class RealOptOut24HourSubmissionSuccessRateReporter @Inject constructor(
                         endDate,
                     )
 
+                    logcat { "PIR-CUSTOM-STATS: 24hr submission ${it.name} : $successRate" }
                     if (successRate != null) {
                         pirPixelSender.reportBrokerCustomStateOptOutSubmitRate(
                             brokerUrl = it.url,
@@ -60,6 +64,7 @@ class RealOptOut24HourSubmissionSuccessRateReporter @Inject constructor(
                     }
                 }
 
+                logcat { "PIR-CUSTOM-STATS: Updating last send date to $endDate" }
                 pirRepository.setCustomStatsPixelsLastSentMs(endDate)
             }
         }

pir/pir-impl/src/main/java/com/duckduckgo/pir/impl/pixels/OptOutConfirmationReporter.kt

@@ -27,6 +27,7 @@ import com.duckduckgo.pir.impl.store.PirRepository
 import com.duckduckgo.pir.impl.store.PirSchedulingRepository
 import com.squareup.anvil.annotations.ContributesBinding
 import kotlinx.coroutines.withContext
+import logcat.logcat
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
@@ -43,6 +44,8 @@ class RealOptOutConfirmationReporter @Inject constructor(
     private val pixelSender: PirPixelSender,
 ) : OptOutConfirmationReporter {
     override suspend fun attemptFirePixel() {
+        logcat { "PIR-CUSTOM-STATS: Attempt to fire confirmation pixels" }
+
         withContext(dispatcherProvider.io()) {
             val activeBrokers = pirRepository.getAllActiveBrokerObjects().associateBy { it.name }
             val allValidRequestedOptOutJobs = pirSchedulingRepository.getAllValidOptOutJobRecords().filter {
@@ -51,6 +54,7 @@ class RealOptOutConfirmationReporter @Inject constructor(
 
             if (activeBrokers.isEmpty() || allValidRequestedOptOutJobs.isEmpty()) return@withContext
 
+            logcat { "PIR-CUSTOM-STATS: Will fire confirmation pixels for ${allValidRequestedOptOutJobs.size} jobs" }
             allValidRequestedOptOutJobs.also {
                 // Fire 7 day pixel
                 it.attemptFirePixelForConfirmationDay(
@@ -112,17 +116,20 @@ class RealOptOutConfirmationReporter @Inject constructor(
         markOptOutJobRecordReporting: suspend (OptOutJobRecord, Long) -> Unit,
     ) {
         val now = currentTimeProvider.currentTimeMillis()
-        val optOutsForSevenDayPixel = this.filter {
+        val optOutsForPixel = this.filter {
             it.daysPassedSinceSubmission(now, confirmationDay) && jobRecordFilter(it)
         }
 
-        optOutsForSevenDayPixel.forEach { optOutJobRecord ->
-            val brokerUrl = activeBrokers[optOutJobRecord.brokerName]?.url ?: return@forEach
+        logcat { "PIR-CUSTOM-STATS: Firing 7day confirmation pixels for ${optOutsForPixel.size} jobs" }
+        optOutsForPixel.forEach { optOutJobRecord ->
+            val broker = activeBrokers[optOutJobRecord.brokerName] ?: return@forEach
 
             if (optOutJobRecord.status == REMOVED) {
-                emitConfirmPixel(brokerUrl)
+                logcat { "PIR-CUSTOM-STATS: Firing $confirmationDay day confirmation pixels for ${broker.name}" }
+                emitConfirmPixel(broker.url)
             } else {
-                emitUnconfirmPixel(brokerUrl)
+                logcat { "PIR-CUSTOM-STATS: Firing $confirmationDay day unconfirmation pixels for ${broker.name}" }
+                emitUnconfirmPixel(broker.url)
             }
 
             markOptOutJobRecordReporting(optOutJobRecord, now)

pir/pir-impl/src/main/java/com/duckduckgo/pir/impl/pixels/PirCustomStatsWorker.kt

@@ -21,6 +21,7 @@ import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
 import com.duckduckgo.anvil.annotations.ContributesWorker
 import com.duckduckgo.di.scopes.AppScope
+import logcat.logcat
 import javax.inject.Inject
 
 @ContributesWorker(AppScope::class)
@@ -35,6 +36,7 @@ class PirCustomStatsWorker(
     lateinit var optOutConfirmationReporter: OptOutConfirmationReporter
 
     override suspend fun doWork(): Result {
+        logcat { "PIR-CUSTOM-STATS: Attempt to fire custom pixels" }
         optOutSubmissionSuccessRateReporter.attemptFirePixel()
         optOutConfirmationReporter.attemptFirePixel()
 

pir/pir-impl/src/main/java/com/duckduckgo/pir/impl/scan/PirScanScheduler.kt

@@ -31,6 +31,7 @@ import com.duckduckgo.app.di.AppCoroutineScope
 import com.duckduckgo.appbuildconfig.api.AppBuildConfig
 import com.duckduckgo.common.utils.CurrentTimeProvider
 import com.duckduckgo.di.scopes.AppScope
+import com.duckduckgo.pir.impl.common.PirJobConstants.CUSTOM_PIXEL_INTERVAL_HOURS
 import com.duckduckgo.pir.impl.common.PirJobConstants.EMAIL_CONFIRMATION_INTERVAL_HOURS
 import com.duckduckgo.pir.impl.common.PirJobConstants.SCHEDULED_SCAN_INTERVAL_HOURS
 import com.duckduckgo.pir.impl.email.PirEmailConfirmationRemoteWorker
@@ -134,8 +135,9 @@ class RealPirScanScheduler @Inject constructor(
     }
 
     private fun scheduleRecurringPixelStats() {
-        val periodicWorkRequest = PeriodicWorkRequestBuilder<PirCustomStatsWorker>(5, TimeUnit.HOURS)
+        val periodicWorkRequest = PeriodicWorkRequestBuilder<PirCustomStatsWorker>(CUSTOM_PIXEL_INTERVAL_HOURS, TimeUnit.HOURS)
             .addTag(TAG_PIR_RECURRING_CUSTOM_STATS)
+            .setInitialDelay(CUSTOM_PIXEL_INTERVAL_HOURS, TimeUnit.HOURS)
             .build()
 
         workManager.enqueueUniquePeriodicWork(