diff --git a/common/lib/capa/capa/safe_exec/safe_exec.py b/common/lib/capa/capa/safe_exec/safe_exec.py index 80508f61c9..c71854f917 100644 --- a/common/lib/capa/capa/safe_exec/safe_exec.py +++ b/common/lib/capa/capa/safe_exec/safe_exec.py @@ -6,6 +6,7 @@ import hashlib from codejail.safe_exec import SafeExecException, json_safe from codejail.safe_exec import not_safe_exec as codejail_not_safe_exec from codejail.safe_exec import safe_exec as codejail_safe_exec +from edx_django_utils.monitoring import function_trace import six from six import text_type @@ -79,6 +80,7 @@ def update_hash(hasher, obj): hasher.update(six.b(repr(obj))) +@function_trace('safe_exec') def safe_exec( code, globals_dict, diff --git a/common/lib/xmodule/xmodule/modulestore/mixed.py b/common/lib/xmodule/xmodule/modulestore/mixed.py index f7f538f6a9..88bb8215fe 100644 --- a/common/lib/xmodule/xmodule/modulestore/mixed.py +++ b/common/lib/xmodule/xmodule/modulestore/mixed.py @@ -4,8 +4,6 @@ MixedModuleStore allows for aggregation between multiple modulestores. In this way, courses can be served up via either SplitMongoModuleStore or MongoModuleStore. """ - - import functools import itertools import logging diff --git a/common/lib/xmodule/xmodule/modulestore/split_mongo/split_draft.py b/common/lib/xmodule/xmodule/modulestore/split_mongo/split_draft.py index a51a1eb371..d8895bdbd3 100644 --- a/common/lib/xmodule/xmodule/modulestore/split_mongo/split_draft.py +++ b/common/lib/xmodule/xmodule/modulestore/split_mongo/split_draft.py @@ -1,8 +1,7 @@ """ Module for the dual-branch fall-back Draft->Published Versioning ModuleStore """ - - +from edx_django_utils.monitoring import function_trace from opaque_keys.edx.locator import CourseLocator, LibraryLocator, LibraryUsageLocator from xmodule.exceptions import InvalidVersionError @@ -56,6 +55,7 @@ class DraftVersioningModuleStore(SplitMongoModuleStore, ModuleStoreDraftAndPubli return item + @function_trace('get_course.split_modulestore') def get_course(self, course_id, depth=0, **kwargs): course_id = self._map_revision_to_branch(course_id) return super().get_course(course_id, depth=depth, **kwargs)