Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 7 additions & 12 deletions cms/djangoapps/contentstore/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
from user_tasks.models import UserTaskArtifact, UserTaskStatus
from user_tasks.tasks import UserTask

import dogstats_wrapper as dog_stats_api
from contentstore.courseware_index import CoursewareSearchIndexer, LibrarySearchIndexer, SearchIndexingError
from contentstore.storage import course_import_export_storage
from contentstore.utils import initialize_permissions, reverse_usage_url
Expand Down Expand Up @@ -865,17 +864,13 @@ def get_dir_for_filename(directory, filename):
self.status.set_state(u'Updating')
self.status.increment_completed_steps()

with dog_stats_api.timer(
u'courselike_import.time',
tags=[u"courselike:{}".format(courselike_key)]
):
courselike_items = import_func(
modulestore(), user.id,
settings.GITHUB_REPO_ROOT, [dirpath],
load_error_modules=False,
static_content_store=contentstore(),
target_id=courselike_key
)
courselike_items = import_func(
modulestore(), user.id,
settings.GITHUB_REPO_ROOT, [dirpath],
load_error_modules=False,
static_content_store=contentstore(),
target_id=courselike_key
)

new_location = courselike_items[0].location
LOGGER.debug(u'new course at %s', new_location)
Expand Down
10 changes: 0 additions & 10 deletions cms/djangoapps/contentstore/views/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
from opaque_keys.edx.keys import UsageKey
from xblock.core import XBlock

import dogstats_wrapper as dog_stats_api
from contentstore.utils import reverse_course_url, reverse_library_url, reverse_usage_url
from edxmako.shortcuts import render_to_string
from models.settings.course_grading import CourseGradingModel
Expand Down Expand Up @@ -268,15 +267,6 @@ def create_xblock(parent_locator, user, category, display_name, boilerplate=None
# if we add one then we need to also add it to the policy information (i.e. metadata)
# we should remove this once we can break this reference from the course to static tabs
if category == 'static_tab':

dog_stats_api.increment(
DEPRECATION_VSCOMPAT_EVENT,
tags=(
"location:create_xblock_static_tab",
u"course:{}".format(unicode(dest_usage_key.course_key)),
)
)

display_name = display_name or _("Empty") # Prevent name being None
course = store.get_course(dest_usage_key.course_key)
course.tabs.append(
Expand Down
10 changes: 0 additions & 10 deletions cms/djangoapps/contentstore/views/item.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
from xblock.core import XBlock
from xblock.fields import Scope

import dogstats_wrapper as dog_stats_api
from cms.lib.xblock.authoring_mixin import VISIBILITY_VIEW
from contentstore.utils import (
ancestor_has_staff_lock,
Expand Down Expand Up @@ -934,15 +933,6 @@ def _delete_item(usage_key, user):
# if we add one then we need to also add it to the policy information (i.e. metadata)
# we should remove this once we can break this reference from the course to static tabs
if usage_key.block_type == 'static_tab':

dog_stats_api.increment(
DEPRECATION_VSCOMPAT_EVENT,
tags=(
"location:_delete_item_static_tab",
u"course:{}".format(unicode(usage_key.course_key)),
)
)

course = store.get_course(usage_key.course_key)
existing_tabs = course.tabs or []
course.tabs = [tab for tab in existing_tabs if tab.get('url_slug') != usage_key.block_id]
Expand Down
3 changes: 0 additions & 3 deletions cms/envs/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -1030,9 +1030,6 @@
'track',
'eventtracking.django.apps.EventTrackingConfig',

# Monitoring
'openedx.core.djangoapps.datadog.apps.DatadogConfig',

# For asset pipelining
'edxmako.apps.EdxMakoConfig',
'pipeline',
Expand Down
2 changes: 1 addition & 1 deletion cms/envs/devstack.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import logging

# Disable noisy loggers
for pkg_name in ['track.contexts', 'track.middleware', 'dd.dogapi']:
for pkg_name in ['track.contexts', 'track.middleware']:
logging.getLogger(pkg_name).setLevel(logging.CRITICAL)


Expand Down
6 changes: 1 addition & 5 deletions common/djangoapps/track/tracker.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
from importlib import import_module

from django.conf import settings
from dogapi import dog_stats_api

from track.backends import BaseBackend

Expand Down Expand Up @@ -81,17 +80,14 @@ def _instantiate_backend_from_name(name, options):
return backend


@dog_stats_api.timed('track.send')
def send(event):
"""
Send an event object to all the initialized backends.

"""
dog_stats_api.increment('track.send.count')

for name, backend in backends.iteritems():
with dog_stats_api.timer('track.send.backend.{0}'.format(name)):
backend.send(event)
backend.send(event)


_initialize_backends_from_django_settings()
Loading