From 808ecb69f7b7126cd6eeae58635d59964d826019 Mon Sep 17 00:00:00 2001 From: Jeff Boek Date: Wed, 17 Apr 2019 13:42:46 -0700 Subject: [PATCH] [fenix] For https://github.com/mozilla-mobile/fenix/issues/1297 - Re-adds adjust to build task --- app/src/main/java/org/mozilla/fenix/components/Analytics.kt | 4 +++- automation/taskcluster/lib/tasks.py | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/components/Analytics.kt b/app/src/main/java/org/mozilla/fenix/components/Analytics.kt index 5c45217d30..f10597b511 100644 --- a/app/src/main/java/org/mozilla/fenix/components/Analytics.kt +++ b/app/src/main/java/org/mozilla/fenix/components/Analytics.kt @@ -15,6 +15,7 @@ import mozilla.components.lib.crash.service.SentryService import org.mozilla.fenix.BuildConfig import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.R +import org.mozilla.fenix.components.metrics.AdjustMetricsService import org.mozilla.fenix.components.metrics.GleanMetricsService import org.mozilla.fenix.components.metrics.LeanplumMetricsService import org.mozilla.fenix.components.metrics.MetricController @@ -72,7 +73,8 @@ class Analytics( MetricController.create( listOf( GleanMetricsService(context), - LeanplumMetricsService(context as Application) + LeanplumMetricsService(context as Application), + AdjustMetricsService(context) ), isTelemetryEnabled = { Settings.getInstance(context).isTelemetryEnabled } ) diff --git a/automation/taskcluster/lib/tasks.py b/automation/taskcluster/lib/tasks.py index 413c65c294..26a45b7296 100644 --- a/automation/taskcluster/lib/tasks.py +++ b/automation/taskcluster/lib/tasks.py @@ -56,6 +56,9 @@ class TaskBuilder(object): leanplum_secret = '{}project/mobile/fenix/leanplum'.format( 'garbage/staging/' if is_staging else '' ) + adjust_secret = '{}project/mobile/fenix/adjust'.format( + 'garbage/staging/' if is_staging else '' + ) pre_gradle_commands = ( 'python automation/taskcluster/helper/get-secret.py -s {} -k {} -f {}'.format( @@ -64,6 +67,7 @@ class TaskBuilder(object): for secret, key, target_file in ( (sentry_secret, 'dsn', '.sentry_token'), (leanplum_secret, 'production', '.leanplum_token'), + (adjust_secret, 'Greenfield', '.adjust_token'), ) ) @@ -87,7 +91,7 @@ class TaskBuilder(object): description='Build Fenix from source code', command=command, scopes=[ - "secrets:get:{}".format(secret) for secret in (sentry_secret, leanplum_secret) + "secrets:get:{}".format(secret) for secret in (sentry_secret, leanplum_secret, adjust_secret) ], artifacts=artifacts, routes=routes,