From 848a9dfd9afc7b0d9db010cc35d4d8d542997c54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Pt=C3=A1=C4=8Dek?= Date: Mon, 29 May 2023 15:57:17 +0200 Subject: [PATCH] refactor --- .../android/prometheus/android/exporter/PromViewModel.kt | 6 ++---- .../android/exporter/{ => worker}/AndroidCustomExporter.kt | 6 +----- .../android/exporter/{ => worker}/ConfigObject.kt | 4 ++-- .../android/exporter/{ => worker}/MetricsEngine.kt | 2 +- .../android/exporter/{ => worker}/PromServerWorker.kt | 2 +- .../android/exporter/{ => worker}/PrometheusServer.kt | 2 +- .../android/exporter/{ => worker}/PushProxClient.kt | 4 +--- .../android/exporter/{ => worker}/PushProxWorker.kt | 5 ++--- client/build.gradle | 4 ++-- 9 files changed, 13 insertions(+), 22 deletions(-) rename client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/{ => worker}/AndroidCustomExporter.kt (86%) rename client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/{ => worker}/ConfigObject.kt (89%) rename client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/{ => worker}/MetricsEngine.kt (97%) rename client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/{ => worker}/PromServerWorker.kt (77%) rename client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/{ => worker}/PrometheusServer.kt (99%) rename client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/{ => worker}/PushProxClient.kt (98%) rename client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/{ => worker}/PushProxWorker.kt (97%) diff --git a/client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/PromViewModel.kt b/client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/PromViewModel.kt index 015620d..f82be24 100644 --- a/client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/PromViewModel.kt +++ b/client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/PromViewModel.kt @@ -9,18 +9,16 @@ import androidx.work.Data import androidx.work.ExistingWorkPolicy import androidx.work.NetworkType import androidx.work.OneTimeWorkRequestBuilder -import androidx.work.Operation import androidx.work.OutOfQuotaPolicy import androidx.work.WorkManager -import io.prometheus.client.CollectorRegistry -import io.prometheus.client.exporter.common.TextFormat +import com.birdthedeveloper.prometheus.android.prometheus.android.exporter.worker.PushProxConfig +import com.birdthedeveloper.prometheus.android.prometheus.android.exporter.worker.PushProxWorker import kotlinx.coroutines.delay import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch -import java.io.StringWriter enum class ConfigFileState { LOADING, diff --git a/client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/AndroidCustomExporter.kt b/client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/worker/AndroidCustomExporter.kt similarity index 86% rename from client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/AndroidCustomExporter.kt rename to client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/worker/AndroidCustomExporter.kt index 75d0485..e528c9a 100644 --- a/client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/AndroidCustomExporter.kt +++ b/client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/worker/AndroidCustomExporter.kt @@ -1,12 +1,8 @@ -package com.birdthedeveloper.prometheus.android.prometheus.android.exporter +package com.birdthedeveloper.prometheus.android.prometheus.android.exporter.worker import android.util.Log import io.prometheus.client.Collector -import io.prometheus.client.Collector.MetricFamilySamples import io.prometheus.client.GaugeMetricFamily -import kotlinx.coroutines.runBlocking -import java.util.Arrays -import kotlinx.coroutines.* private val TAG = "ANDROID_EXPORTER" diff --git a/client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/ConfigObject.kt b/client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/worker/ConfigObject.kt similarity index 89% rename from client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/ConfigObject.kt rename to client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/worker/ConfigObject.kt index af7260d..a8e1e74 100644 --- a/client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/ConfigObject.kt +++ b/client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/worker/ConfigObject.kt @@ -1,4 +1,4 @@ -package com.birdthedeveloper.prometheus.android.prometheus.android.exporter +package com.birdthedeveloper.prometheus.android.prometheus.android.exporter.worker import androidx.work.Data @@ -7,7 +7,7 @@ data class PushProxConfig( val pushProxFqdn : String, ){ companion object{ - fun fromData(data : Data) : PushProxConfig{ + fun fromData(data : Data) : PushProxConfig { return PushProxConfig( data.getString("0")!!, data.getString("1")!!, diff --git a/client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/MetricsEngine.kt b/client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/worker/MetricsEngine.kt similarity index 97% rename from client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/MetricsEngine.kt rename to client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/worker/MetricsEngine.kt index 0b9251c..414cd22 100644 --- a/client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/MetricsEngine.kt +++ b/client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/worker/MetricsEngine.kt @@ -1,4 +1,4 @@ -package com.birdthedeveloper.prometheus.android.prometheus.android.exporter +package com.birdthedeveloper.prometheus.android.prometheus.android.exporter.worker import android.content.Context import android.content.Intent diff --git a/client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/PromServerWorker.kt b/client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/worker/PromServerWorker.kt similarity index 77% rename from client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/PromServerWorker.kt rename to client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/worker/PromServerWorker.kt index 0d845f8..221313c 100644 --- a/client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/PromServerWorker.kt +++ b/client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/worker/PromServerWorker.kt @@ -1,2 +1,2 @@ -package com.birdthedeveloper.prometheus.android.prometheus.android.exporter +package com.birdthedeveloper.prometheus.android.prometheus.android.exporter.worker diff --git a/client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/PrometheusServer.kt b/client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/worker/PrometheusServer.kt similarity index 99% rename from client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/PrometheusServer.kt rename to client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/worker/PrometheusServer.kt index 6403234..417a45a 100644 --- a/client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/PrometheusServer.kt +++ b/client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/worker/PrometheusServer.kt @@ -1,4 +1,4 @@ -package com.birdthedeveloper.prometheus.android.prometheus.android.exporter +package com.birdthedeveloper.prometheus.android.prometheus.android.exporter.worker import android.util.Log import io.ktor.server.application.call diff --git a/client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/PushProxClient.kt b/client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/worker/PushProxClient.kt similarity index 98% rename from client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/PushProxClient.kt rename to client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/worker/PushProxClient.kt index b59ddd8..0ea61d5 100644 --- a/client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/PushProxClient.kt +++ b/client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/worker/PushProxClient.kt @@ -1,4 +1,4 @@ -package com.birdthedeveloper.prometheus.android.prometheus.android.exporter +package com.birdthedeveloper.prometheus.android.prometheus.android.exporter.worker import android.util.Log import io.github.reugn.kotlin.backoff.StrategyBackoff @@ -13,8 +13,6 @@ import io.ktor.http.HttpMethod import io.prometheus.client.CollectorRegistry import io.prometheus.client.Counter import kotlinx.coroutines.CancellationException -import kotlinx.coroutines.GlobalScope -import kotlinx.coroutines.launch /** * Counters for monitoring the pushprox itself, compatible with the reference diff --git a/client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/PushProxWorker.kt b/client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/worker/PushProxWorker.kt similarity index 97% rename from client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/PushProxWorker.kt rename to client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/worker/PushProxWorker.kt index a008df5..9fb6fca 100644 --- a/client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/PushProxWorker.kt +++ b/client/app/src/main/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/worker/PushProxWorker.kt @@ -1,17 +1,16 @@ -package com.birdthedeveloper.prometheus.android.prometheus.android.exporter +package com.birdthedeveloper.prometheus.android.prometheus.android.exporter.worker import android.app.NotificationManager import android.content.Context import android.util.Log import androidx.core.app.NotificationCompat import androidx.work.CoroutineWorker -import androidx.work.Data import androidx.work.ForegroundInfo import androidx.work.WorkManager import androidx.work.WorkerParameters +import com.birdthedeveloper.prometheus.android.prometheus.android.exporter.R import io.prometheus.client.CollectorRegistry import io.prometheus.client.exporter.common.TextFormat -import kotlinx.coroutines.delay import java.io.StringWriter private val TAG = "PUSH_PROX_WORKER" diff --git a/client/build.gradle b/client/build.gradle index c116aed..1dea762 100644 --- a/client/build.gradle +++ b/client/build.gradle @@ -4,7 +4,7 @@ buildscript { } }// Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '8.0.1' apply false - id 'com.android.library' version '8.0.1' apply false + id 'com.android.application' version '8.0.2' apply false + id 'com.android.library' version '8.0.2' apply false id 'org.jetbrains.kotlin.android' version '1.7.0' apply false }