wip

client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/worker/ExponentialBackoff.kt

@@ -38,6 +38,8 @@ class ExponentialBackoff {
                         }
                     }
 
+                    Log.d(TAG, "Exception caught")
+
                     onException()
 
                     // calculate new delay

client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/worker/PromWorker.kt

@@ -11,6 +11,7 @@ import androidx.work.WorkerParameters
 import com.birdthedeveloper.prometheus.android.prometheus.android.exporter.R
 import com.birdthedeveloper.prometheus.android.prometheus.android.exporter.compose.PromConfiguration
 import io.prometheus.client.CollectorRegistry
+import io.prometheus.client.exemplars.ExemplarConfig
 import io.prometheus.client.exporter.common.TextFormat
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -38,6 +39,7 @@ class PromWorker(
     init {
         val androidCustomExporter = AndroidCustomExporter(metricsEngine)
         androidCustomExporter.register<AndroidCustomExporter>(collectorRegistry)
+        ExemplarConfig.disableExemplars() // prometheus client library configuration
     }
 
     //TODO foreground notification

client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/worker/RemoteWriteSender.kt

@@ -12,6 +12,7 @@ import io.ktor.client.request.post
 import io.ktor.client.request.setBody
 import io.ktor.http.HttpHeaders
 import io.ktor.http.HttpStatusCode
+import io.prometheus.client.Collector.MetricFamilySamples
 import io.prometheus.client.CollectorRegistry
 import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.channels.BufferOverflow
@@ -86,16 +87,26 @@ class RemoteWriteSender(private val config: RemoteWriteConfiguration) {
     private suspend fun performScrapeAndSaveIt(channel: Channel<Unit>) {
         Log.d(TAG, "performScrapeAndSaveIt start")
         val scrapedMetrics = config.collectorRegistry.metricFamilySamples()
-        storage.writeScrapedSample(scrapedMetrics)
+        val metricsScrape : MetricsScrape = MetricsScrape.fromMfs(scrapedMetrics)
+
+        storage.writeScrapedSample(metricsScrape)
         channel.send(Unit)
         Log.d(TAG, "performScrapeAndSaveIt end")
     }
 
+    private fun insertInitialDummyScrape(){
+        lastTimeRingBuffer.setLastTime(System.currentTimeMillis())
+    }
+
     private suspend fun scraper(channel: Channel<Unit>) {
-        val checkDelay = 1000L
+        val checkDelay : Long = 1000L
+
+        insertInitialDummyScrape()
+
         while (true) {
             if (lastTimeRingBuffer.checkScrapeDidNotHappenInTime()) {
                 remoteWriteOn = true
+                Log.d(TAG, "Turning remote write on")
 
                 performScrapeAndSaveIt(channel)
                 delay(config.scrapeInterval * 1000L)
@@ -105,8 +116,10 @@ class RemoteWriteSender(private val config: RemoteWriteConfiguration) {
                     performScrapeAndSaveIt(channel)
                 }
 
+                Log.d(TAG, "Turning remote write off")
                 remoteWriteOn = false
             }
+
             delay(checkDelay)
         }
     }
@@ -140,7 +153,7 @@ class RemoteWriteSender(private val config: RemoteWriteConfiguration) {
     }
 
     private suspend fun exportToRemoteWriteEndpoint() {
-        Log.d(TAG, "sendAll")
+        Log.d(TAG, "export To Remote Write Endpoint")
         if (!scrapesAreBeingSent) {
             scrapesAreBeingSent = true
 
@@ -190,10 +203,12 @@ class RemoteWriteSender(private val config: RemoteWriteConfiguration) {
             coroutineScope { //TODO this could be a problem
                 launch {
                     // check for outage in scrapes, save scrapes to storage
+                    Log.d(TAG, "Launching scraper")
                     scraper(channel)
                 }
                 launch {
                     // send saved scrapes to remote write endpoint
+                    Log.d(TAG, "Launching senderManager")
                     senderManager(channel)
                 }
             }
@@ -207,7 +222,6 @@ class RemoteWriteSender(private val config: RemoteWriteConfiguration) {
     }
 
     fun countSuccessfulScrape() {
-        Log.d(TAG, "Counting successful scrape")
         lastTimeRingBuffer.setLastTime(System.currentTimeMillis())
     }
 

client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/worker/RemoteWriteSenderStorage.kt

@@ -18,12 +18,27 @@ private const val TAG: String = "REMOTE_WRITE_SENDER_STORAGE"
 // No need for locks as all operations are run on a single thread, defined in PromWorker
 // This class defines contract for RemoteWriteSender storage
 
-typealias MetricsScrape = Enumeration<MetricFamilySamples>
+// the same structure as MetricFamilySamples
+data class MetricsScrape(
+    val timeSeriesList : List<TimeSeries>
+){
+    companion object {
+        fun fromMfs(input : Enumeration<MetricFamilySamples>) : MetricsScrape{
+            for (family in input){
+                for (sample in family.samples){
+                    
+                }
+            }
+        }
+    }
+}
 
-// HashMap<List of labels including name, List of TimeSeries samples to this TimeSeries>
+data class TimeSeries(
-private typealias ConverterHashMap = HashMap<List<TimeSeriesLabel>, MutableList<TimeSeriesSample>>
+    val sample : TimeSeriesSample,
+    val labels : List<TimeSeriesLabel>,
+)
 
-private data class TimeSeriesLabel(
+data class TimeSeriesLabel(
     val name: String,
     val value: String,
 ) {
@@ -35,7 +50,7 @@ private data class TimeSeriesLabel(
     }
 }
 
-private data class TimeSeriesSample(
+data class TimeSeriesSample(
     val timeStampMs: Long,
     val value: Double,
 ) {
@@ -47,6 +62,10 @@ private data class TimeSeriesSample(
     }
 }
 
+// HashMap<List of labels including name, List of TimeSeries samples to this TimeSeries>
+private typealias ConverterHashMap = HashMap<List<TimeSeriesLabel>, MutableList<TimeSeriesSample>>
+
+
 abstract class RemoteWriteSenderStorage {
     private val remoteWriteLabel: TimeSeriesLabel = TimeSeriesLabel(
         name = "backfill",