From a75acffe01a79fe80c7fafc456bd755954f9027f Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Wed, 24 Oct 2012 15:11:41 -0400
Subject: [PATCH] made requested changes to statsd names, score bucket

---
 common/djangoapps/student/views.py         |  8 +++---
 lms/djangoapps/courseware/module_render.py | 32 +++++++++++-----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index dc541ff40b..2b940fe982 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -208,7 +208,7 @@ def change_enrollment(request):
                     .format(course.display_name)}
                     
         org, course_num, run=course_id.split("/")        
-        statsd.increment("lms.user.enrollment",
+        statsd.increment("common.student.enrollment",
                         tags=["org:{0}".format(org),
                               "course:{0}".format(course_num),
                               "run:{0}".format(run)])
@@ -222,7 +222,7 @@ def change_enrollment(request):
             enrollment.delete()
             
             org, course_num, run=course_id.split("/")        
-            statsd.increment("lms.user.unenrollment",
+            statsd.increment("common.student.unenrollment",
                             tags=["org:{0}".format(org),
                                   "course:{0}".format(course_num),
                                   "run:{0}".format(run)])
@@ -276,7 +276,7 @@ def login_user(request, error=""):
 
         try_change_enrollment(request)
         
-        statsd.increment("lms.user.successful_login")
+        statsd.increment("common.student.successful_login")
         
         return HttpResponse(json.dumps({'success': True}))
     
@@ -484,7 +484,7 @@ def create_account(request, post_override=None):
             login_user.is_active = True
             login_user.save()
             
-    statsd.increment("lms.user.account_created")
+    statsd.increment("common.student.account_created")
     
     js = {'success': True}
     return HttpResponse(json.dumps(js), mimetype="application/json")
diff --git a/lms/djangoapps/courseware/module_render.py b/lms/djangoapps/courseware/module_render.py
index 8c91405b96..94bbc918bf 100644
--- a/lms/djangoapps/courseware/module_render.py
+++ b/lms/djangoapps/courseware/module_render.py
@@ -383,15 +383,10 @@ def xqueue_callback(request, course_id, userid, id, dispatch):
         instance_module.grade = instance.get_score()['score']
     if instance_module.grade != oldgrade or instance_module.state != old_instance_state:
         instance_module.save()
-        
-        score_bucket=0
-        if(instance_module.grade>0 and instance_module.grade<instance_module.max_grade):
-            score_bucket=1
-        elif(instance_module.grade==instance_module.max_grade):
-            score_bucket=2
-            
+
+        score_bucket=get_score_bucket(instance_module.grade, instance_module.max_grade)
         org, course_num, run=course_id.split("/")        
-        statsd.increment("lms.user.question_answered",
+        statsd.increment("lms.courseware.question_answered",
                         tags=["org:{0}".format(org),
                               "course:{0}".format(course_num),
                               "run:{0}".format(run), 
@@ -480,15 +475,10 @@ def modx_dispatch(request, dispatch, location, course_id):
             instance_module.state != old_instance_state or
             instance_module.max_grade != old_instance_max_grade):
             instance_module.save()
-            
-            score_bucket=0
-            if(instance_module.grade>0 and instance_module.grade<instance_module.max_grade):
-                score_bucket=1
-            elif(instance_module.grade==instance_module.max_grade):
-                score_bucket=2
-            
+
+            score_bucket=get_score_bucket(instance_module.grade, instance_module.max_grade)
             org, course_num, run=course_id.split("/")        
-            statsd.increment("lms.user.question_answered",
+            statsd.increment("lms.courseware.question_answered",
                             tags=["org:{0}".format(org),
                                   "course:{0}".format(course_num),
                                   "run:{0}".format(run), 
@@ -540,5 +530,15 @@ def preview_chemcalc(request):
 
     return HttpResponse(json.dumps(result))
 
+#Function to split arbitrary score ranges into 3 buckets.
+#Used with statsd tracking.
+def get_score_bucket(grade,max_grade):
+    score_bucket="incorrect"
+    if(grade>0 and grade<max_grade):
+        score_bucket="partial"
+    elif(grade==max_grade):
+        score_bucket="correct"
+
+    return score_bucket