rename package name

README.md

@@ -28,7 +28,7 @@ CTRL + SHIFT + ALT + L
 Client application is configurable via a configuration file.
 Place such file on your android device at a following path:
 ```
-data/user/0/com.birdthedeveloper.prometheus.android.prometheus.android.exporter/files/
+data/user/0/com.birdthedeveloper.prometheus.android.exporter/files/
 ```
 The name of such configuration file can be either `config.yaml` or `config.yml`
 

client/app/build.gradle

@@ -11,11 +11,11 @@ apply plugin: 'com.google.protobuf'
 apply plugin: 'kotlin-android'
 
 android {
-    namespace 'com.birdthedeveloper.prometheus.android.prometheus.android.exporter'
+    namespace 'com.birdthedeveloper.prometheus.android.exporter'
     compileSdk 33
 
     defaultConfig {
-        applicationId "com.birdthedeveloper.prometheus.android.prometheus.android.exporter"
+        applicationId "com.birdthedeveloper.prometheus.android.exporter"
         minSdk 26
         targetSdk 33
         versionCode 1

client/app/src/androidTest/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/ExampleInstrumentedTest.kt

@@ -1,4 +1,4 @@
-package com.birdthedeveloper.prometheus.android.prometheus.android.exporter
+package com.birdthedeveloper.prometheus.android.exporter
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -20,7 +20,7 @@ class ExampleInstrumentedTest {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
         assertEquals(
-            "com.birdthedeveloper.prometheus.android.prometheus.android.exporter",
+            "com.birdthedeveloper.prometheus.android.exporter",
             appContext.packageName
         )
     }

client/app/src/main/java/com/birdthedeveloper/prometheus/android/exporter/compose/Configuration.kt

@@ -1,6 +1,6 @@
 // Author: Martin Ptacek
 
-package com.birdthedeveloper.prometheus.android.prometheus.android.exporter.compose
+package com.birdthedeveloper.prometheus.android.exporter.compose
 
 import android.content.Context
 import android.util.Log
@@ -102,7 +102,7 @@ data class PromConfiguration(
     }
 
     companion object {
-        // data/user/0/com.birdthedeveloper.prometheus.android.prometheus.android.exporter/files
+        // data/user/0/com.birdthedeveloper.prometheus.android.exporter/files
         private const val filename: String = "config.yaml"
         private const val alternativeFilename: String = "config.yml"
         fun configFileExists(context: Context): Boolean {

client/app/src/main/java/com/birdthedeveloper/prometheus/android/exporter/compose/HomeActivity.kt

@@ -1,6 +1,6 @@
 // Author: Martin Ptacek
 
-package com.birdthedeveloper.prometheus.android.prometheus.android.exporter.compose
+package com.birdthedeveloper.prometheus.android.exporter.compose
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -176,7 +176,7 @@ private fun StartStopButton(
 private fun TabPage(
     promViewModel: PromViewModel,
 ) {
-    val tabs = mapOf(0 to "Prom Server", 1 to "PushProx", 2 to "Remote write")
+    val tabs = mapOf(0 to "Prom Server", 1 to "PushProx", 2 to "Batch exporter")
     val uiState: PromUiState by promViewModel.uiState.collectAsState()
 
     Column {

client/app/src/main/java/com/birdthedeveloper/prometheus/android/exporter/compose/MainActivity.kt

@@ -1,6 +1,6 @@
 // Author: Martin Ptacek
 
-package com.birdthedeveloper.prometheus.android.prometheus.android.exporter.compose
+package com.birdthedeveloper.prometheus.android.exporter.compose
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
@@ -15,7 +15,7 @@ import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
-import com.birdthedeveloper.prometheus.android.prometheus.android.exporter.ui.theme.PrometheusAndroidExporterTheme
+import com.birdthedeveloper.prometheus.android.exporter.ui.theme.PrometheusAndroidExporterTheme
 
 class MainActivity : ComponentActivity() {
 

client/app/src/main/java/com/birdthedeveloper/prometheus/android/exporter/compose/PromViewModel.kt

@@ -1,6 +1,6 @@
 // Author: Martin Ptacek
 
-package com.birdthedeveloper.prometheus.android.prometheus.android.exporter.compose
+package com.birdthedeveloper.prometheus.android.exporter.compose
 
 import android.content.Context
 import android.util.Log
@@ -16,7 +16,7 @@ import androidx.work.OutOfQuotaPolicy
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
 import androidx.work.WorkQuery
-import com.birdthedeveloper.prometheus.android.prometheus.android.exporter.worker.PromWorker
+import com.birdthedeveloper.prometheus.android.exporter.worker.PromWorker
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow

client/app/src/main/java/com/birdthedeveloper/prometheus/android/exporter/compose/SettingsActivity.kt

@@ -1,6 +1,6 @@
 // Author: Martin Ptacek
 
-package com.birdthedeveloper.prometheus.android.prometheus.android.exporter.compose
+package com.birdthedeveloper.prometheus.android.exporter.compose
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize

client/app/src/main/java/com/birdthedeveloper/prometheus/android/exporter/ui/theme/Color.kt

@@ -1,4 +1,4 @@
-package com.birdthedeveloper.prometheus.android.prometheus.android.exporter.ui.theme
+package com.birdthedeveloper.prometheus.android.exporter.ui.theme
 
 import androidx.compose.ui.graphics.Color
 

client/app/src/main/java/com/birdthedeveloper/prometheus/android/exporter/ui/theme/Shape.kt

@@ -1,4 +1,4 @@
-package com.birdthedeveloper.prometheus.android.prometheus.android.exporter.ui.theme
+package com.birdthedeveloper.prometheus.android.exporter.ui.theme
 
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Shapes

client/app/src/main/java/com/birdthedeveloper/prometheus/android/exporter/ui/theme/Theme.kt

@@ -1,4 +1,4 @@
-package com.birdthedeveloper.prometheus.android.prometheus.android.exporter.ui.theme
+package com.birdthedeveloper.prometheus.android.exporter.ui.theme
 
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material.MaterialTheme

client/app/src/main/java/com/birdthedeveloper/prometheus/android/exporter/ui/theme/Type.kt

@@ -1,4 +1,4 @@
-package com.birdthedeveloper.prometheus.android.prometheus.android.exporter.ui.theme
+package com.birdthedeveloper.prometheus.android.exporter.ui.theme
 
 import androidx.compose.material.Typography
 import androidx.compose.ui.text.TextStyle

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

@@ -1,6 +1,6 @@
 // Author: Martin Ptacek
 
-package com.birdthedeveloper.prometheus.android.prometheus.android.exporter.worker
+package com.birdthedeveloper.prometheus.android.exporter.worker
 
 import android.util.Log
 import io.prometheus.client.Collector

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

@@ -1,6 +1,6 @@
 // Author: Martin Ptacek
 
-package com.birdthedeveloper.prometheus.android.prometheus.android.exporter.worker
+package com.birdthedeveloper.prometheus.android.exporter.worker
 
 import android.util.Log
 import kotlinx.coroutines.CancellationException

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

@@ -1,6 +1,6 @@
 // Author: Martin Ptacek
 
-package com.birdthedeveloper.prometheus.android.prometheus.android.exporter.worker
+package com.birdthedeveloper.prometheus.android.exporter.worker
 
 import android.content.Context
 import android.content.Intent

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

@@ -1,6 +1,6 @@
 // Author: Martin Ptacek
 
-package com.birdthedeveloper.prometheus.android.prometheus.android.exporter.worker
+package com.birdthedeveloper.prometheus.android.exporter.worker
 
 import android.app.NotificationManager
 import android.content.Context
@@ -10,8 +10,8 @@ import androidx.work.CoroutineWorker
 import androidx.work.ForegroundInfo
 import androidx.work.WorkManager
 import androidx.work.WorkerParameters
-import com.birdthedeveloper.prometheus.android.prometheus.android.exporter.R
+import com.birdthedeveloper.prometheus.android.exporter.R
-import com.birdthedeveloper.prometheus.android.prometheus.android.exporter.compose.PromConfiguration
+import com.birdthedeveloper.prometheus.android.exporter.compose.PromConfiguration
 import io.prometheus.client.CollectorRegistry
 import io.prometheus.client.exemplars.ExemplarConfig
 import io.prometheus.client.exporter.common.TextFormat

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

@@ -1,6 +1,6 @@
 // Author: Martin Ptacek
 
-package com.birdthedeveloper.prometheus.android.prometheus.android.exporter.worker
+package com.birdthedeveloper.prometheus.android.exporter.worker
 
 import android.util.Log
 import io.ktor.http.HttpStatusCode

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

@@ -1,6 +1,6 @@
 // Author: Martin Ptacek
 
-package com.birdthedeveloper.prometheus.android.prometheus.android.exporter.worker
+package com.birdthedeveloper.prometheus.android.exporter.worker
 
 import android.content.Context
 import android.util.Log

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

@@ -1,6 +1,6 @@
 // Author: Martin Ptacek
 
-package com.birdthedeveloper.prometheus.android.prometheus.android.exporter.worker
+package com.birdthedeveloper.prometheus.android.exporter.worker
 
 import android.content.Context
 import android.net.ConnectivityManager

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

@@ -1,6 +1,6 @@
 // Author: Martin Ptacek
 
-package com.birdthedeveloper.prometheus.android.prometheus.android.exporter.worker
+package com.birdthedeveloper.prometheus.android.exporter.worker
 
 //import android.content.Context
 //import androidx.annotation.EmptySuper

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

@@ -1,6 +1,6 @@
 // Author: Martin Ptacek
 
-package com.birdthedeveloper.prometheus.android.prometheus.android.exporter.worker
+package com.birdthedeveloper.prometheus.android.exporter.worker
 
 import android.util.Log
 import remote.write.RemoteWrite

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

@@ -1,6 +1,6 @@
 // Author: Martin Ptacek
 
-package com.birdthedeveloper.prometheus.android.prometheus.android.exporter.worker
+package com.birdthedeveloper.prometheus.android.exporter.worker
 
 import android.util.Log
 import io.prometheus.client.Collector.MetricFamilySamples

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

@@ -1,6 +1,6 @@
 // Author: Martin Ptacek
 
-package com.birdthedeveloper.prometheus.android.prometheus.android.exporter.worker
+package com.birdthedeveloper.prometheus.android.exporter.worker
 
 private const val TAG = "SCRAPE_RECORDER"
 

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

@@ -1,6 +1,6 @@
 // Author: Martin Ptacek
 
-package com.birdthedeveloper.prometheus.android.prometheus.android.exporter.worker
+package com.birdthedeveloper.prometheus.android.exporter.worker
 
 import android.content.Context
 import android.net.ConnectivityManager

client/app/src/test/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/worker/LastTimeRingBufferTest.kt

@@ -1,4 +1,4 @@
-package com.birdthedeveloper.prometheus.android.prometheus.android.exporter.worker
+package com.birdthedeveloper.prometheus.android.exporter.worker
 
 import org.junit.Assert
 import org.junit.Assert.*

client/app/src/test/java/com/birdthedeveloper/prometheus/android/prometheus/android/exporter/worker/RemoteWriteSenderStorageTest.kt

@@ -1,4 +1,4 @@
-package com.birdthedeveloper.prometheus.android.prometheus.android.exporter.worker
+package com.birdthedeveloper.prometheus.android.exporter.worker
 
 import org.junit.Assert.*
 import org.junit.Test