Check for custom callouts on app builds

corehq/apps/app_manager/models.py

@@ -181,7 +181,6 @@
 from corehq.blobs.mixin import CODES, BlobMixin
 from corehq.const import USER_DATE_FORMAT, USER_TIME_FORMAT
 from corehq.util import bitly, view_utils
-from corehq.util.metrics import metrics_counter
 from corehq.util.quickcache import quickcache
 from corehq.util.timer import TimingContext, time_method
 from corehq.util.timezones.conversions import ServerTime
@@ -4468,31 +4467,8 @@ def make_build(self, comment=None, user_id=None):
         assert copy._id
         prune_auto_generated_builds.delay(self.domain, self._id)
 
-        self.check_build_dependencies(new_build=copy)
-
         return copy
 
-    def check_build_dependencies(self, new_build):
-        """
-        Reports whether the app dependencies have been added or removed.
-        """
-
-        def has_dependencies(build):
-            return bool(
-                build.profile.get('features', {}).get('dependencies')
-            )
-
-        new_build_has_dependencies = has_dependencies(new_build)
-
-        last_build = get_latest_build_doc(self.domain, self.id)
-        last_build = self.__class__.wrap(last_build) if last_build else None
-        last_build_has_dependencies = has_dependencies(last_build) if last_build else False
-
-        if not last_build_has_dependencies and new_build_has_dependencies:
-            metrics_counter('commcare.app_build.dependencies_added')
-        elif last_build_has_dependencies and not new_build_has_dependencies:
-            metrics_counter('commcare.app_build.dependencies_removed')
-
     def convert_app_to_build(self, copy_of, user_id, comment=None):
         self.copy_of = copy_of
         built_on = datetime.datetime.utcnow()

corehq/apps/app_manager/tasks.py

@@ -7,6 +7,7 @@
     get_app,
     get_auto_generated_built_apps,
     get_latest_build_id,
+    get_build_ids,
 )
 from corehq.apps.app_manager.exceptions import (
     AppValidationError,
@@ -15,6 +16,7 @@
 from corehq.apps.users.models import CommCareUser, CouchUser
 from corehq.toggles import USH_USERCASES_FOR_WEB_USERS
 from corehq.util.decorators import serial_task
+from corehq.util.metrics import metrics_counter
 
 logger = get_task_logger(__name__)
 
@@ -91,3 +93,53 @@ def update_linked_app_and_notify_task(domain, app_id, master_app_id, user_id, em
 def load_appcues_template_app(domain, username, app_slug):
     from corehq.apps.app_manager.views.apps import load_app_from_slug
     load_app_from_slug(domain, username, app_slug)
+
+
+@task(queue='background_queue', ignore_result=True)
+def analyse_new_app_build(domain, new_build_id):
+    new_build = get_app(domain, new_build_id)
+
+    check_for_custom_callouts(new_build)
+    check_build_dependencies(new_build)
+
+
+def check_for_custom_callouts(new_build):
+    from corehq.apps.app_manager.util import app_callout_templates_ids
+
+    def app_has_custom_intents():
+        return any(
+            any(set(form.wrapped_xform().odk_intents) - app_callout_templates_ids)
+            for form in new_build.get_forms()
+        )
+
+    if app_has_custom_intents():
+        metrics_counter(
+            'commcare.app_build.custom_app_callout',
+            tags={'domain': new_build.domain, 'app_id': new_build.copy_of},
+        )
+
+
+def check_build_dependencies(new_build):
+    """
+    Reports whether the app dependencies have been added or removed.
+    """
+
+    def has_dependencies(build):
+        return bool(
+            build.profile.get('features', {}).get('dependencies')
+        )
+
+    new_build_has_dependencies = has_dependencies(new_build)
+    app_build_ids = get_build_ids(new_build.domain, new_build.copy_of)
+
+    last_build_has_dependencies = False
+
+    if len(app_build_ids) > 1:
+        previous_build_id = app_build_ids[app_build_ids.index(new_build.id) + 1]
+        previous_build = get_app(new_build.domain, previous_build_id)
+        last_build_has_dependencies = has_dependencies(previous_build) if previous_build else False
+
+    if not last_build_has_dependencies and new_build_has_dependencies:
+        metrics_counter('commcare.app_build.dependencies_added')
+    elif last_build_has_dependencies and not new_build_has_dependencies:
+        metrics_counter('commcare.app_build.dependencies_removed')

corehq/apps/app_manager/tests/test_apps.py

@@ -39,6 +39,7 @@
 from corehq.apps.domain.shortcuts import create_domain
 from corehq.apps.linked_domain.applications import link_app
 from corehq.apps.userreports.tests.utils import get_sample_report_config
+from corehq.apps.app_manager.views.releases import make_app_build
 
 
 MockRequest = namedtuple('MockRequest', ['status', 'data'])
@@ -423,8 +424,8 @@ def test_dependencies_feature_added(self):
         factory.app.save()
         self.addCleanup(factory.app.delete)
 
-        with patch("corehq.apps.app_manager.models.metrics_counter") as metric_counter_mock:
-            factory.app.make_build()
+        with patch("corehq.apps.app_manager.tasks.metrics_counter") as metric_counter_mock:
+            make_app_build(factory.app, "comment", user_id="user_id")
             metric_counter_mock.assert_called_with('commcare.app_build.dependencies_added')
 
     def test_dependencies_feature_removed(self):
@@ -440,8 +441,8 @@ def test_dependencies_feature_removed(self):
         factory.app.profile = {'features': {'dependencies': []}}
         factory.app.save()
 
-        with patch("corehq.apps.app_manager.models.metrics_counter") as metric_counter_mock:
-            factory.app.make_build()
+        with patch("corehq.apps.app_manager.tasks.metrics_counter") as metric_counter_mock:
+            make_app_build(factory.app, "comment", user_id="user_id")
             metric_counter_mock.assert_called_with('commcare.app_build.dependencies_removed')
 
     def test_dependencies_feature_metrics_not_triggerd(self):
@@ -456,6 +457,6 @@ def test_dependencies_feature_metrics_not_triggerd(self):
 
         factory.app.save()
 
-        with patch("corehq.apps.app_manager.models.metrics_counter") as metric_counter_mock:
-            factory.app.make_build()
+        with patch("corehq.apps.app_manager.tasks.metrics_counter") as metric_counter_mock:
+            make_app_build(factory.app, "comment", user_id="user_id")
             metric_counter_mock.assert_not_called()

corehq/apps/app_manager/util.py

@@ -540,7 +540,13 @@ def _app_callout_templates():
         yield data
 
 
+@quickcache([], timeout=60 * 60 * 24 * 7)  # 1 week
+def _app_callout_templates_ids():
+    return {t['id'] for t in next(_app_callout_templates())}
+
+
 app_callout_templates = _app_callout_templates()
+app_callout_templates_ids = _app_callout_templates_ids()
 
 
 def purge_report_from_mobile_ucr(report_config):

corehq/apps/app_manager/views/releases.py

@@ -67,6 +67,7 @@
 )
 from corehq.apps.app_manager.tasks import (
     create_build_files_for_all_app_profiles,
+    analyse_new_app_build,
 )
 from corehq.apps.app_manager.util import (
     get_and_assert_practice_user_in_domain,
@@ -387,6 +388,7 @@ def make_app_build(app, comment, user_id):
         user_id=user_id,
     )
     copy.save(increment_version=False)
+    analyse_new_app_build.delay(app.domain, copy._id)
     return copy