From 3a7ab8ff3a625e5d23233dcac32a407c2418c236 Mon Sep 17 00:00:00 2001
From: Guillaume Jacquart <guillaume.jacquart@hoodbrains.com>
Date: Thu, 29 Dec 2022 08:40:39 +0100
Subject: [PATCH 1/2] 855: setup Sentry telemetry.

---
 .gitlab-ci.yml                                |  1 +
 README.md                                     |  4 +++-
 app/build.gradle                              |  5 ++++-
 app/src/main/AndroidManifest.xml              |  7 ++++++-
 .../PrivacyCentralApplication.kt              | 21 ++++++++++++++++++-
 dependencies.gradle                           |  2 ++
 load-properties.gradle                        |  1 +
 7 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 17512518..1cddc6ac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,7 @@ stages:
 variables:
   MAPBOX_KEY: $MAPBOX_KEY_DEV
   MAPBOX_SECRET_KEY: $MAPBOX_SECRET_KEY_DEV
+  SENTRY_DSN: $SENTRY_DSN
 
 workflow:
   rules:
diff --git a/README.md b/README.md
index 5cc125df..17d2c629 100644
--- a/README.md
+++ b/README.md
@@ -42,13 +42,14 @@ You can use any latest stable version of android studio to be able to build this
 - Target SDK: 30 (Android R)
 
 ## API Keys
-This project uses [Mapbox](https://docs.mapbox.com/android/maps/guides/install/) sdk for displaying maps. To download and use the mapbox sdk, you need to supply API key and secret and set them as follows:
+This project uses [Sentry](https://sentry.io) for telemetry and crash reports,  [Mapbox](https://docs.mapbox.com/android/maps/guides/install/) sdk for displaying maps. To download and use the mapbox sdk, you need to supply API key and secret and set them as follows:
 
 ### For local build
 You can set them in local.properties
 ```
 MAPBOX_KEY=<insert mapbox public key>
 MAPBOX_SECRET_KEY=<insert mapbox secret key>
+SENTRY_DSN=<insert sentry dsn>
 ```
 **IMP: Never add this file to version control.**
 
@@ -57,6 +58,7 @@ When building in CI environment, we don't have local.properties file. So the fol
 ```
 export MAPBOX_KEY=<insert mapbox public key>
 export MAPBOX_SECRET_KEY=<insert mapbox secret key>
+export SENTRY_DSN=<insert sentry dsn>
 ```
 
 ## Code Style and Quality
diff --git a/app/build.gradle b/app/build.gradle
index 12d11590..bb2f6ac7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -39,6 +39,7 @@ android {
         ]
 
         resValue("string", "mapbox_key", MAPBOX_KEY)
+        buildConfigField("String", "SENTRY_DSN", "\"$SENTRY_DSN\"")
     }
 
     signingConfigs {
@@ -150,7 +151,9 @@ dependencies {
         Libs.Retrofit.scalars,
 
         Libs.MapBox.sdk,
-        Libs.mpAndroidCharts
+        Libs.mpAndroidCharts,
+
+        Libs.sentry
     )
 
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3bcd7640..d787f50c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright  (C) 2022 ECORP
+    Copyright  (C) 2022 ECORP, 2022 MURENA SAS
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -93,6 +93,11 @@
             android:launchMode="singleInstance"
             android:theme="@style/Theme.InvisibleActivity"
             />
+
+        <meta-data
+            android:name="io.sentry.auto-init"
+            android:value="false"
+            />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/foundation/e/privacycentralapp/PrivacyCentralApplication.kt b/app/src/main/java/foundation/e/privacycentralapp/PrivacyCentralApplication.kt
index 28e96e0c..cd816893 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/PrivacyCentralApplication.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/PrivacyCentralApplication.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 E FOUNDATION
+ * Copyright (C) 2021 E FOUNDATION, 2022 MURENA SAS
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,7 +18,9 @@
 package foundation.e.privacycentralapp
 
 import android.app.Application
+import android.provider.Settings
 import com.mapbox.mapboxsdk.Mapbox
+import io.sentry.android.core.SentryAndroid
 
 class PrivacyCentralApplication : Application() {
 
@@ -27,8 +29,25 @@ class PrivacyCentralApplication : Application() {
 
     override fun onCreate() {
         super.onCreate()
+        initTelemetry()
         Mapbox.getTelemetry()?.setUserTelemetryRequestState(false)
 
         dependencyContainer.initBackgroundSingletons()
     }
+
+    private fun initTelemetry() {
+        val activateTelemetry = kotlin.runCatching {
+            Settings.System.getInt(contentResolver, "telemetry") == 1
+        }.getOrDefault(false)
+
+        if (activateTelemetry) {
+            SentryAndroid.init(this) { options ->
+                options.setDsn(BuildConfig.SENTRY_DSN)
+                options.setEnvironment(BuildConfig.BUILD_TYPE)
+                options.setSampleRate(1.0)
+                options.setEnableUserInteractionTracing(true)
+                options.setProfilesSampleRate(1.0)
+            }
+        }
+    }
 }
diff --git a/dependencies.gradle b/dependencies.gradle
index 6c4acb31..1d986b80 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -118,3 +118,5 @@ libs.MapBox = [
 ]
 
 libs.mpAndroidCharts = 'com.github.PhilJay:MPAndroidChart:v3.1.0'
+
+libs.sentry = 'io.sentry:sentry-android:6.10.0'
diff --git a/load-properties.gradle b/load-properties.gradle
index 71c9fb52..2c0134e3 100644
--- a/load-properties.gradle
+++ b/load-properties.gradle
@@ -30,4 +30,5 @@ if (localPropertiesFile.exists()) {
 } else {
     ext["MAPBOX_KEY"] = System.getenv('MAPBOX_KEY')
     ext["MAPBOX_SECRET_KEY"] = System.getenv('MAPBOX_SECRET_KEY')
+    ext["SENTRY_DSN"] = System.getenv('SENTRY_DSN')
 }
\ No newline at end of file
-- 
GitLab


From 378e05c72658c0a6aaa36370441b0af37d2705de Mon Sep 17 00:00:00 2001
From: Guillaume Jacquart <guillaume.jacquart@hoodbrains.com>
Date: Sun, 8 Jan 2023 10:30:20 +0100
Subject: [PATCH 2/2] Use telemetry lib

---
 app/build.gradle                              |  2 +-
 app/src/main/AndroidManifest.xml              |  5 ----
 .../PrivacyCentralApplication.kt              | 23 +++----------------
 dependencies.gradle                           |  2 +-
 4 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index bb2f6ac7..7f048d2c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -153,7 +153,7 @@ dependencies {
         Libs.MapBox.sdk,
         Libs.mpAndroidCharts,
 
-        Libs.sentry
+        Libs.telemetry
     )
 
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d787f50c..c155aa5d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -93,11 +93,6 @@
             android:launchMode="singleInstance"
             android:theme="@style/Theme.InvisibleActivity"
             />
-
-        <meta-data
-            android:name="io.sentry.auto-init"
-            android:value="false"
-            />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/foundation/e/privacycentralapp/PrivacyCentralApplication.kt b/app/src/main/java/foundation/e/privacycentralapp/PrivacyCentralApplication.kt
index cd816893..639fec2f 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/PrivacyCentralApplication.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/PrivacyCentralApplication.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 E FOUNDATION, 2022 MURENA SAS
+ * Copyright (C) 2021 E FOUNDATION, 2022 - 2023 MURENA SAS
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,9 +18,8 @@
 package foundation.e.privacycentralapp
 
 import android.app.Application
-import android.provider.Settings
 import com.mapbox.mapboxsdk.Mapbox
-import io.sentry.android.core.SentryAndroid
+import foundation.e.lib.telemetry.Telemetry
 
 class PrivacyCentralApplication : Application() {
 
@@ -29,25 +28,9 @@ class PrivacyCentralApplication : Application() {
 
     override fun onCreate() {
         super.onCreate()
-        initTelemetry()
+        Telemetry.init(BuildConfig.SENTRY_DSN, this)
         Mapbox.getTelemetry()?.setUserTelemetryRequestState(false)
 
         dependencyContainer.initBackgroundSingletons()
     }
-
-    private fun initTelemetry() {
-        val activateTelemetry = kotlin.runCatching {
-            Settings.System.getInt(contentResolver, "telemetry") == 1
-        }.getOrDefault(false)
-
-        if (activateTelemetry) {
-            SentryAndroid.init(this) { options ->
-                options.setDsn(BuildConfig.SENTRY_DSN)
-                options.setEnvironment(BuildConfig.BUILD_TYPE)
-                options.setSampleRate(1.0)
-                options.setEnableUserInteractionTracing(true)
-                options.setProfilesSampleRate(1.0)
-            }
-        }
-    }
 }
diff --git a/dependencies.gradle b/dependencies.gradle
index 1d986b80..352958ef 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -119,4 +119,4 @@ libs.MapBox = [
 
 libs.mpAndroidCharts = 'com.github.PhilJay:MPAndroidChart:v3.1.0'
 
-libs.sentry = 'io.sentry:sentry-android:6.10.0'
+libs.telemetry = 'foundation.e.lib:telemetry:0.0.3-alpha'
-- 
GitLab