fix: Disable mixpanel in tests (#2140)

Flank · Aug 17, 2021 · b112436 · b112436
1 parent 3e76b0c
commit b112436
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/macos_workflow.yml b/.github/workflows/macos_workflow.yml
@@ -37,10 +37,6 @@ jobs:
       with:
         arguments: "clean build"
 
-    - uses: stefanzweifel/git-auto-commit-action@v4
-      with:
-        commit_message: "[Auto-commit] Added files fixed by Detekt"
-
     - name: Codecov
       uses: codecov/codecov-action@v1
       with:

diff --git a/flank_wrapper/build.gradle.kts b/flank_wrapper/build.gradle.kts
@@ -24,7 +24,7 @@ shadowJar.apply {
     }
 }
 // <breaking change>.<feature added>.<fix/minor change>
-version = "1.2.2"
+version = "1.2.3"
 group = "com.github.flank"
 
 repositories {

diff --git a/flank_wrapper/src/main/kotlin/com/github/flank/wrapper/internal/FlankWrapperAnalytics.kt b/flank_wrapper/src/main/kotlin/com/github/flank/wrapper/internal/FlankWrapperAnalytics.kt
@@ -1,19 +1,20 @@
 package com.github.flank.wrapper.internal
 
+import flank.common.config.isTest
 import flank.tool.analytics.mixpanel.Mixpanel
 
 private const val FLANK_WRAPPER = "flank_wrapper"
 private const val EVENT_RUN = "flank run"
 private const val EVENT_NEW_FLANK_VERSION_DOWNLOADED = "new_version_downloaded"
 
 internal fun sendAnalyticsNewFlankVersionDownloaded() {
-    Mixpanel.configure(FLANK_WRAPPER)
+    Mixpanel.configure(FLANK_WRAPPER, blockUsageStatistics = isTest())
     Mixpanel.add(FLANK_WRAPPER, EVENT_NEW_FLANK_VERSION_DOWNLOADED)
     Mixpanel.send(FLANK_WRAPPER)
 }
 
 internal fun sendAnalyticsFlankRun() {
-    Mixpanel.configure(FLANK_WRAPPER)
+    Mixpanel.configure(FLANK_WRAPPER, blockUsageStatistics = isTest())
     Mixpanel.add(FLANK_WRAPPER, EVENT_RUN)
     Mixpanel.send(FLANK_WRAPPER)
 }
diff --git a/flank_wrapper/src/main/resources/version.txt b/flank_wrapper/src/main/resources/version.txt
@@ -1 +1 @@
-1.2.2
+1.2.3
diff --git a/integration_tests/src/test/resources/cases/flank_ios_gameloop_success.yml b/integration_tests/src/test/resources/cases/flank_ios_gameloop_success.yml
@@ -8,4 +8,4 @@ gcloud:
       version: 13.6
       orientation: portrait
       locale: en_US
-      disable-usage-statistics: true
+  disable-usage-statistics: true
diff --git a/test_runner/src/main/kotlin/ftl/analytics/InitUsageStatistics.kt b/test_runner/src/main/kotlin/ftl/analytics/InitUsageStatistics.kt
@@ -1,5 +1,6 @@
 package ftl.analytics
 
+import flank.common.config.isTest
 import flank.tool.analytics.mixpanel.Mixpanel
 import ftl.args.AndroidArgs
 import ftl.args.IArgs
@@ -8,7 +9,7 @@ import ftl.args.IosArgs
 internal fun IArgs.initUsageStatistics() {
     Mixpanel.configure(
         projectName = project,
-        blockUsageStatistics = disableUsageStatistics,
+        blockUsageStatistics = isTest() || disableUsageStatistics,
         AndroidArgs::class,
         IosArgs::class,
         IArgs::class

diff --git a/tool/analytics/mixpanel/src/main/kotlin/flank/tool/analytics/mixpanel/Mixpanel.kt b/tool/analytics/mixpanel/src/main/kotlin/flank/tool/analytics/mixpanel/Mixpanel.kt
@@ -33,11 +33,13 @@ object Mixpanel {
         projectName: String,
         blockUsageStatistics: Boolean = false,
         vararg statisticClasses: KClass<*>
-    ): Unit = configureReport(
-        projectName = projectName,
-        blockUsageStatistics = blockUsageStatistics,
-        statisticClasses = statisticClasses
-    )
+    ) {
+        configureReport(
+            projectName = projectName,
+            blockUsageStatistics = blockUsageStatistics,
+            statisticClasses = statisticClasses
+        )
+    }
 
     fun removeSensitiveValues(map: ObjectMap): ObjectMap = map.removeNotNeededKeys().anonymizeSensitiveValues()