wip

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

@@ -1,29 +0,0 @@
-package com.birdthedeveloper.prometheus.android.prometheus.android.exporter.worker
-
-import androidx.work.Data
-
-data class PushProxConfig(
-    val pushProxUrl : String,
-    val pushProxFqdn : String,
-){
-    companion object{
-        fun fromData(data : Data) : PushProxConfig {
-            return PushProxConfig(
-                data.getString("0")!!,
-                data.getString("1")!!,
-            )
-        }
-    }
-
-    fun toData() : Data {
-        return Data.Builder()
-            .putString("0", pushProxUrl)
-            .putString("1", pushProxFqdn)
-            .build()
-    }
-}
-
-data class PromServerConfig(
-    //TODO implement this
-    val dummy : String,
-)

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

@@ -27,9 +27,8 @@ class PromWorker(
     parameters : WorkerParameters,
 ) : CoroutineWorker(context, parameters) {
 
-    private val collectorRegistry: CollectorRegistry = CollectorRegistry()
     private val metricsEngine : MetricsEngine = MetricsEngine(context)
-    private val pushProxClient = PushProxClient(collectorRegistry, ::performScrape)
+    private val pushProxClient = PushProxClient(::performScrape)
     private lateinit var androidCustomExporter : AndroidCustomExporter
 
     //TODO foreground notification
@@ -39,13 +38,13 @@ class PromWorker(
 
     private fun performScrape() : String{
         val writer = StringWriter()
-        TextFormat.write004(writer, collectorRegistry.metricFamilySamples())
+        TextFormat.write004(writer, CollectorRegistry.defaultRegistry.metricFamilySamples())
         return writer.toString()
     }
 
     private fun initializeWork(config : PromConfiguration){
         // initialize metrics
-        androidCustomExporter = AndroidCustomExporter(metricsEngine).register(collectorRegistry)
+        androidCustomExporter = AndroidCustomExporter(metricsEngine).register()
     }
 
     private suspend fun startServices(config : PromConfiguration){

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

@@ -40,9 +40,8 @@ class PrometheusServer() {
                 delay(Long.MAX_VALUE)
             }finally {
                 withContext(NonCancellable){
-                    Log.v(TAG, "3")
+                    Log.v(TAG, "Canceling Prometheus server")
                     server.stop()
-                    Log.v(TAG, "4")
                 }
             }
         }

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

@@ -10,45 +10,43 @@ import io.ktor.client.statement.HttpResponse
 import io.ktor.http.HttpMethod
 import io.prometheus.client.CollectorRegistry
 import io.prometheus.client.Counter
-import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.NonCancellable
+import kotlinx.coroutines.withContext
+
+private const val TAG = "PUSHPROX_CLIENT"
+
+// configuration class for pushprox
+data class PushProxConfig(
+    val pushProxUrl : String,
+    val pushProxFqdn : String,
+    val registry : CollectorRegistry,
+)
 
 /**
  * Counters for monitoring the pushprox itself, compatible with the reference
  * implementation in golang, source: https://github.dev/prometheus-community/PushProx
  */
-private class Counters(collectorRegistry: CollectorRegistry) {
+private class PushProxCounter(registry: CollectorRegistry) {
-    private val collectorRegistry : CollectorRegistry
+    private val pushErrorCounter : Counter = Counter.build()
-    private val scrapeErrorCounter : Counter
-    private val pushErrorCounter : Counter
-    private val pollErrorCounter : Counter
-
-    init {
-        this.collectorRegistry = collectorRegistry
-
-        // following 3 counters are compatible with reference implementation
-        scrapeErrorCounter = Counter.build()
-            .name("pushprox_client_scrape_errors_total")
-            .help("Number of scrape errors")
-            .register(collectorRegistry)
-        pushErrorCounter = Counter.build()
-            .name("pushprox_client_push_errors_total")
-            .help("Number of push errors")
-            .register(collectorRegistry)
-        pollErrorCounter = Counter.build()
             .name("pushprox_client_poll_errors_total")
             .help("Number of poll errors")
-            .register(collectorRegistry)
+            .register(registry)
+    private val scrapeErrorCounter : Counter = Counter.build()
+            .name("pushprox_client_scrape_errors_total")
+            .help("Number of scrape errors")
+            .register(registry)
 
-    }
+    private val pollErrorCounter : Counter = Counter.build()
+            .name("pushprox_client_push_errors_total")
+            .help("Number of push errors")
+            .register(registry)
 
     fun scrapeError(){ scrapeErrorCounter.inc()}
-
     fun pushError(){ pushErrorCounter.inc() }
-
     fun pollError(){ pollErrorCounter.inc() } //TODO use this thing
 }
 
-// Error in parsing HTTP header "Id" from HTTP request from Prometheus
+// Error in parsing HTTP header "Id" from HTTP request from Prometheus //TODO wtf
 class PushProxIdParseException(message: String) : Exception(message)
 
 // Context object for pushprox internal functions to avoid global variables
@@ -60,22 +58,28 @@ data class PushProxContext(
 )
 
 // This is a stripped down kotlin implementation of github.com/prometheus-community/PushProx client
-class PushProxClient(
+class PushProxClient(config: PushProxConfig) {
-    collectorRegistry: CollectorRegistry,
+    private val counters : PushProxCounter = PushProxCounter(config.registry)
-    private val performScrape: suspend () -> String
-) {
-    private val counters : Counters = Counters(collectorRegistry)
-    private val retryInitialWaitSeconds : Int = 1
-    private val retryMaxWaitSeconds : Int = 5
 
     // Use this function to start exporting metrics to pushprox in the background
-    suspend fun startBackground(config: PushProxConfig) {
+    suspend fun start(config: PushProxConfig) {
-            val client : HttpClient = HttpClient() //TODO close this thing
+        Log.v(TAG, "Starting pushprox client")
-            val context : PushProxContext = processConfig(client, config)
+
+        var client : HttpClient? = null
+        try {
+            client = HttpClient()
+            val context : PushProxContext = getPushProxContext(client, config)
             loop(context)
+        }finally {
+            withContext(NonCancellable){
+                Log.v(TAG, "Canceling pushprox client")
+                client?.close()
+            }
+        }
     }
 
-    private fun processConfig(client : HttpClient, config : PushProxConfig) : PushProxContext {
+
+    private fun getPushProxContext(client : HttpClient, config : PushProxConfig) : PushProxContext {
         var modifiedProxyURL = config.pushProxUrl.trim('/')
 
         if(
@@ -96,6 +100,7 @@ class PushProxClient(
         )
     }
 
+    //TODO refactor this function
     // Continuous poll from android phone to pushprox gateway
     private suspend fun doPoll(context : PushProxContext){
         log("poll", "polling now")
@@ -107,6 +112,7 @@ class PushProxClient(
         doPush(context, responseBody)
     }
 
+    //TODO refactor this function
     // get value of HTTP header "Id" from response body
     private fun getIdFromResponseBody(responseBody: String) : String {
 
@@ -118,14 +124,14 @@ class PushProxClient(
         return id
     }
 
+    //TODO refactor this function
     private fun composeRequestBody(scrapedMetrics: String, id : String) : String {
         val httpHeaders = "HTTP/1.1 200 OK\r\n" +
             "Content-Type: text/plain; version=0.0.4; charset=utf-8\r\n" +
             "Id: $id\r\n" +
             "X-Prometheus-Scrape-Timeout: 9.5\r\n"
 
-        val result : String = httpHeaders + "\r\n" + scrapedMetrics
+        return httpHeaders + "\r\n" + scrapedMetrics
-        return result
     }
 
     // Parameter responseBody: response body of /poll request
@@ -158,11 +164,11 @@ class PushProxClient(
 
     //TODO migrate to work manager
     private suspend fun loop(context : PushProxContext) {
-        var shouldContinue : Boolean = true
+        while (true) {
-        while (shouldContinue) {
+            Log.v(TAG, "PushProxClient main loop start")
-            log("pushprox main loop", "loop start")
             // register poll error using try-catch block
             //TODO backoff strategy
+            //TODO asap
 //            var result = context.backoff.withRetries {
 //                try {
 //                    doPoll(context)
@@ -180,11 +186,7 @@ class PushProxClient(
 //                    throw e
 //                }
 //            }
-            log("pushprox main loop", "loop end")
+            Log.v(TAG,"PushProxClient main loop end")
         }
     }
-
-    private fun log(title: String, text: String) {
-        Log.v("PUSHPROXCLIENT", "$title: $text")
-    }
 }

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

@@ -0,0 +1,10 @@
+package com.birdthedeveloper.prometheus.android.prometheus.android.exporter.worker
+
+data class RemoteWriteConfiguration(
+    val scrape_interval : Int,
+    val remote_write_endpoint : String,
+)
+
+class RemoteWrite {
+    //TODO implement this thing
+}