Skip to content

Commit

Permalink
chore: inject supported logs in EVENT_BUS_TRACKING_LOGS
Browse files Browse the repository at this point in the history 
fix: only process signal if it is emitted from the event bus

chore: change tracking log handler logging to debug

test: update test with from_event_bus

chore: install openedx-events v9.5.1

feat: migrate handler to eventtracking
  • Loading branch information
@Ian2012
Ian2012 committed Feb 13, 2024
1 parent 1464e6d commit 6e2acb1
Show file tree
Hide file tree
Showing 11 changed files with 140 additions and 298 deletions.
1 change: 0 additions & 1 deletion event_routing_backends/apps.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,5 @@ def ready(self):
"""
super().ready()
# pylint: disable=import-outside-toplevel, unused-import
from event_routing_backends import handlers # noqa: F401
from event_routing_backends.processors.caliper import event_transformers as caliper_event_transformers
from event_routing_backends.processors.xapi import event_transformers as xapi_event_transformers
57 changes: 0 additions & 57 deletions event_routing_backends/handlers.py
View file

This file was deleted.

190 changes: 97 additions & 93 deletions event_routing_backends/settings/common.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,101 @@ def plugin_settings(settings):
'edx.course.enrollment.deactivated',
'edx.course.grade.passed.first_time'
]
allowed_xapi_events = [
'edx.course.enrollment.activated',
'edx.course.enrollment.deactivated',
'edx.course.enrollment.mode_changed',
'edx.grades.subsection.grade_calculated',
'edx.grades.course.grade_calculated',
'edx.special_exam.timed.attempt.created',
'edx.special_exam.timed.attempt.submitted',
'edx.special_exam.practice.attempt.created',
'edx.special_exam.practice.attempt.submitted',
'edx.special_exam.proctored.attempt.created',
'edx.special_exam.proctored.attempt.submitted',
'edx.completion.block_completion.changed',
'edx.forum.thread.created',
'edx.forum.thread.deleted',
'edx.forum.thread.edited',
'edx.forum.thread.viewed',
'edx.forum.thread.reported',
'edx.forum.thread.unreported',
'edx.forum.thread.voted',
'edx.forum.response.created',
'edx.forum.response.deleted',
'edx.forum.response.edited',
'edx.forum.response.reported',
'edx.forum.response.unreported',
'edx.forum.response.voted',
'edx.forum.comment.created',
'edx.forum.comment.deleted',
'edx.forum.comment.edited',
'edx.forum.comment.reported',
'edx.forum.comment.unreported',
'edx.ui.lms.link_clicked',
'edx.ui.lms.sequence.outline.selected',
'edx.ui.lms.outline.selected',
'edx.ui.lms.sequence.next_selected',
'edx.ui.lms.sequence.previous_selected',
'edx.ui.lms.sequence.tab_selected',
'showanswer',
'edx.problem.hint.demandhint_displayed',
'problem_check',
'load_video',
'edx.video.loaded',
'play_video',
'edx.video.played',
'complete_video',
'edx.video.completed',
'stop_video',
'edx.video.stopped',
'pause_video',
'edx.video.paused',
'seek_video',
'edx.video.position.changed',
'hide_transcript',
'edx.video.transcript.hidden',
'show_transcript',
'edx.video.transcript.shown',
'speed_change_video',
'video_hide_cc_menu',
'edx.video.closed_captions.shown',
'edx.video.closed_captions.hidden',
'edx.video.language_menu.hidden',
'video_show_cc_menu',
'edx.video.language_menu.shown',
'edx.course.grade.passed.first_time'
]
allowed_caliper_events = [
'edx.course.enrollment.activated',
'edx.course.enrollment.deactivated',
'edx.ui.lms.link_clicked',
'edx.ui.lms.sequence.outline.selected',
'edx.ui.lms.outline.selected',
'edx.ui.lms.sequence.next_selected',
'edx.ui.lms.sequence.previous_selected',
'edx.ui.lms.sequence.tab_selected',
'showanswer',
'edx.problem.hint.demandhint_displayed',
'problem_check',
'load_video',
'edx.video.loaded',
'play_video',
'edx.video.played',
'complete_video',
'edx.video.completed',
'stop_video',
'edx.video.stopped',
'pause_video',
'edx.video.paused',
'seek_video',
'edx.video.position.changed',
'edx.course.grade.passed.first_time',
'edx.course.grade.now_passed',
'edx.course.grade.now_failed'
]

settings.EVENT_BUS_TRACKING_LOGS = set(allowed_xapi_events + allowed_caliper_events)

settings.EVENT_TRACKING_BACKENDS.update({
'xapi': {
Expand All @@ -68,71 +163,7 @@ def plugin_settings(settings):
{
'ENGINE': 'eventtracking.processors.whitelist.NameWhitelistProcessor',
'OPTIONS': {
'whitelist': [
'edx.course.enrollment.activated',
'edx.course.enrollment.deactivated',
'edx.course.enrollment.mode_changed',
'edx.grades.subsection.grade_calculated',
'edx.grades.course.grade_calculated',
'edx.special_exam.timed.attempt.created',
'edx.special_exam.timed.attempt.submitted',
'edx.special_exam.practice.attempt.created',
'edx.special_exam.practice.attempt.submitted',
'edx.special_exam.proctored.attempt.created',
'edx.special_exam.proctored.attempt.submitted',
'edx.completion.block_completion.changed',
'edx.forum.thread.created',
'edx.forum.thread.deleted',
'edx.forum.thread.edited',
'edx.forum.thread.viewed',
'edx.forum.thread.reported',
'edx.forum.thread.unreported',
'edx.forum.thread.voted',
'edx.forum.response.created',
'edx.forum.response.deleted',
'edx.forum.response.edited',
'edx.forum.response.reported',
'edx.forum.response.unreported',
'edx.forum.response.voted',
'edx.forum.comment.created',
'edx.forum.comment.deleted',
'edx.forum.comment.edited',
'edx.forum.comment.reported',
'edx.forum.comment.unreported',
'edx.ui.lms.link_clicked',
'edx.ui.lms.sequence.outline.selected',
'edx.ui.lms.outline.selected',
'edx.ui.lms.sequence.next_selected',
'edx.ui.lms.sequence.previous_selected',
'edx.ui.lms.sequence.tab_selected',
'showanswer',
'edx.problem.hint.demandhint_displayed',
'problem_check',
'load_video',
'edx.video.loaded',
'play_video',
'edx.video.played',
'complete_video',
'edx.video.completed',
'stop_video',
'edx.video.stopped',
'pause_video',
'edx.video.paused',
'seek_video',
'edx.video.position.changed',
'hide_transcript',
'edx.video.transcript.hidden',
'show_transcript',
'edx.video.transcript.shown',
'speed_change_video',
'video_hide_cc_menu',
'edx.video.closed_captions.shown',
'edx.video.closed_captions.hidden',
'edx.video.language_menu.hidden',
'video_show_cc_menu',
'edx.video.language_menu.shown',
'edx.course.grade.passed.first_time'
]
'whitelist': allowed_xapi_events
}
},
],
Expand Down Expand Up @@ -161,34 +192,7 @@ def plugin_settings(settings):
{
"ENGINE": "eventtracking.processors.whitelist.NameWhitelistProcessor",
"OPTIONS": {
"whitelist": [
'edx.course.enrollment.activated',
'edx.course.enrollment.deactivated',
'edx.ui.lms.link_clicked',
'edx.ui.lms.sequence.outline.selected',
'edx.ui.lms.outline.selected',
'edx.ui.lms.sequence.next_selected',
'edx.ui.lms.sequence.previous_selected',
'edx.ui.lms.sequence.tab_selected',
'showanswer',
'edx.problem.hint.demandhint_displayed',
'problem_check',
'load_video',
'edx.video.loaded',
'play_video',
'edx.video.played',
'complete_video',
'edx.video.completed',
'stop_video',
'edx.video.stopped',
'pause_video',
'edx.video.paused',
'seek_video',
'edx.video.position.changed',
'edx.course.grade.passed.first_time',
'edx.course.grade.now_passed',
'edx.course.grade.now_failed'
]
"whitelist": allowed_caliper_events
}
}
],
Expand Down
106 changes: 0 additions & 106 deletions event_routing_backends/tests/test_handlers.py
View file

This file was deleted.

1 change: 0 additions & 1 deletion requirements/base.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,3 @@ edx-celeryutils
apache-libcloud # For bulk event log loading
fasteners # Locking tools, required by apache-libcloud, but somehow not installed with it
openedx-filters
openedx-events
Loading

0 comments on commit 6e2acb1

Please sign in to comment.