From bf580ba41bd447d72f2a07f1318aed04d2ff8b4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Pt=C3=A1=C4=8Dek?= <martin.ptace@gmail.com>
Date: Fri, 28 Jul 2023 10:13:23 +0200
Subject: [PATCH] notifications fix

---
 README.md                                     |  2 ++
 client/.idea/deploymentTargetDropDown.xml     |  4 ++--
 client/app/build.gradle                       |  1 +
 client/app/src/main/AndroidManifest.xml       |  1 +
 .../android/exporter/compose/HomeActivity.kt  |  6 ++----
 .../exporter/worker/AndroidCustomExporter.kt  |  7 ++-----
 .../android/exporter/worker/MetricsEngine.kt  |  6 ++++--
 .../android/exporter/worker/PromWorker.kt     | 19 +++++++++++++++----
 8 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 5029e5a..b2c4889 100644
--- a/README.md
+++ b/README.md
@@ -73,3 +73,5 @@ $ ansible-playbook ansible_playbook.yaml --tags config
 ``` 
 
 ## List of exported metrics:
+
+TODO: add grafana dashboard json here
\ No newline at end of file
diff --git a/client/.idea/deploymentTargetDropDown.xml b/client/.idea/deploymentTargetDropDown.xml
index bf3ae45..3fb2dab 100644
--- a/client/.idea/deploymentTargetDropDown.xml
+++ b/client/.idea/deploymentTargetDropDown.xml
@@ -7,11 +7,11 @@
         <deviceKey>
           <Key>
             <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="$USER_HOME$/.android/avd/new_device.avd" />
+            <value value="$USER_HOME$/.android/avd/new3_device.avd" />
           </Key>
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2023-07-25T10:44:56.638251709Z" />
+    <timeTargetWasSelectedWithDropDown value="2023-07-27T06:47:49.277741303Z" />
   </component>
 </project>
\ No newline at end of file
diff --git a/client/app/build.gradle b/client/app/build.gradle
index 6c6dcdb..6305253 100644
--- a/client/app/build.gradle
+++ b/client/app/build.gradle
@@ -29,6 +29,7 @@ android {
 
     buildTypes {
         release {
+            debuggable false
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
diff --git a/client/app/src/main/AndroidManifest.xml b/client/app/src/main/AndroidManifest.xml
index 9e35e59..f0c3aba 100644
--- a/client/app/src/main/AndroidManifest.xml
+++ b/client/app/src/main/AndroidManifest.xml
@@ -7,6 +7,7 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-feature android:name="android.hardware.sensor.accelerometer" android:required="true" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application
         android:allowBackup="true"
diff --git a/client/app/src/main/java/com/birdthedeveloper/prometheus/android/exporter/compose/HomeActivity.kt b/client/app/src/main/java/com/birdthedeveloper/prometheus/android/exporter/compose/HomeActivity.kt
index 6a4d9a2..00b2231 100644
--- a/client/app/src/main/java/com/birdthedeveloper/prometheus/android/exporter/compose/HomeActivity.kt
+++ b/client/app/src/main/java/com/birdthedeveloper/prometheus/android/exporter/compose/HomeActivity.kt
@@ -337,12 +337,11 @@ private fun RemoteWritePage(
         TextField(
             value = uiState.promConfig.remoteWriteMaxSamplesPerExport,
             singleLine = true,
-            keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
             onValueChange = {
                 promViewModel.updatePromConfig(UpdatePromConfig.RemoteWriteMaxSamplesPerExport, it)
             },
             label = {
-                Text(text = "Max number of samples per export")
+                Text(text = "Target label instance")
             },
             enabled = uiState.exporterState == ExporterState.NotRunning,
         )
@@ -350,12 +349,11 @@ private fun RemoteWritePage(
         TextField(
             value = uiState.promConfig.remoteWriteExportInterval,
             singleLine = true,
-            keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
             onValueChange = {
                 promViewModel.updatePromConfig(UpdatePromConfig.RemoteWriteExportInterval, it)
             },
             label = {
-                Text(text = "Export interval in seconds")
+                Text(text = "Target label job")
             },
             enabled = uiState.exporterState == ExporterState.NotRunning,
         )
diff --git a/client/app/src/main/java/com/birdthedeveloper/prometheus/android/exporter/worker/AndroidCustomExporter.kt b/client/app/src/main/java/com/birdthedeveloper/prometheus/android/exporter/worker/AndroidCustomExporter.kt
index 079a1d0..a5b6b35 100644
--- a/client/app/src/main/java/com/birdthedeveloper/prometheus/android/exporter/worker/AndroidCustomExporter.kt
+++ b/client/app/src/main/java/com/birdthedeveloper/prometheus/android/exporter/worker/AndroidCustomExporter.kt
@@ -47,10 +47,7 @@ class AndroidCustomExporter(private val metricEngine: MetricsEngine) : Collector
             "Number of steps", listOf(),
         )
 
-        Log.d(TAG, metricEngine.hwSensorsValues().numberOfSteps.toString())
-        metricEngine.hwSensorsValues().numberOfSteps?.let{
-            gauge.addMetric(listOf(), it.toDouble())
-            mfs.add(gauge)
-        }
+        gauge.addMetric(listOf(), 1.0)
+        mfs.add(gauge)
     }
 }
diff --git a/client/app/src/main/java/com/birdthedeveloper/prometheus/android/exporter/worker/MetricsEngine.kt b/client/app/src/main/java/com/birdthedeveloper/prometheus/android/exporter/worker/MetricsEngine.kt
index 2905103..6b65abf 100644
--- a/client/app/src/main/java/com/birdthedeveloper/prometheus/android/exporter/worker/MetricsEngine.kt
+++ b/client/app/src/main/java/com/birdthedeveloper/prometheus/android/exporter/worker/MetricsEngine.kt
@@ -86,7 +86,8 @@ class MetricsEngine(private val context: Context) : SensorEventListener {
     val hwPropertiesManager = context.getSystemService(Context.HARDWARE_PROPERTIES_SERVICE) as HardwarePropertiesManager
 
     init {
-        registerAllHwEventHandlers()
+        //TODO
+        //registerAllHwEventHandlers()
     }
 
     fun hwSensorsValues(): HwSensorsCache {
@@ -107,7 +108,7 @@ class MetricsEngine(private val context: Context) : SensorEventListener {
     }
 
     fun dispose() {
-        sensorManager.unregisterListener(this)
+        //sensorManager.unregisterListener(this)
     }
 
     override fun onSensorChanged(event: SensorEvent?) {
@@ -256,4 +257,5 @@ class MetricsEngine(private val context: Context) : SensorEventListener {
 
     //TODO has_celular
     //TODO has_wifi
+    //TODO prefix metrics with exporter name - android_ ...
 }
diff --git a/client/app/src/main/java/com/birdthedeveloper/prometheus/android/exporter/worker/PromWorker.kt b/client/app/src/main/java/com/birdthedeveloper/prometheus/android/exporter/worker/PromWorker.kt
index 71623a6..e83428e 100644
--- a/client/app/src/main/java/com/birdthedeveloper/prometheus/android/exporter/worker/PromWorker.kt
+++ b/client/app/src/main/java/com/birdthedeveloper/prometheus/android/exporter/worker/PromWorker.kt
@@ -2,6 +2,7 @@
 
 package com.birdthedeveloper.prometheus.android.exporter.worker
 
+import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
 import android.util.Log
@@ -125,6 +126,8 @@ class PromWorker(
         val inputConfiguration: PromConfiguration = PromConfiguration.fromWorkData(inputData)
         Log.d(TAG, "Launching PromWorker with the following config: $inputConfiguration")
 
+        //setForeground(createForegroundInfo())
+
         startServicesInOneThread(inputConfiguration)
 
         return Result.success()
@@ -134,23 +137,31 @@ class PromWorker(
         return createForegroundInfo()
     }
 
+    //TODO format this thing
     private fun createForegroundInfo(): ForegroundInfo {
+        // create a notification channel first
+        val mNotificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        val channel_id = "CHANNEL_ID"
+        val channel = NotificationChannel("CHANNEL_ID",
+                "YOUR_CHANNEL_NAME", NotificationManager.IMPORTANCE_DEFAULT)
+        channel.description = "YOUR_NOTIFICATION_CHANNEL_DESCRIPTION"
+        mNotificationManager.createNotificationChannel(channel)
+
+
         val id = "id1"
-        val title = "title1"
+        val title = "Prometheus android exporter running"
         val cancel = "cancel1"
         // This PendingIntent can be used to cancel the worker
         val intent = WorkManager.getInstance(applicationContext)
             .createCancelPendingIntent(getId())
 
-        val notification = NotificationCompat.Builder(applicationContext, id)
+        val notification = NotificationCompat.Builder(applicationContext, channel_id)
             .setContentTitle(title)
             .setTicker(title)
-            .setContentText("progress1")
             .setSmallIcon(R.drawable.ic_launcher_foreground)
             .setOngoing(true)
             // Add the cancel action to the notification which can
             // be used to cancel the worker
-            .addAction(android.R.drawable.ic_delete, cancel, intent)
             .build()
 
         return ForegroundInfo(0, notification)