Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update from main (production) #1366

Merged
merged 4 commits into from
Aug 29, 2023
Merged

Update from main (production) #1366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ed5f472
Update Segment url intercepts for fetch-based Segment js API
bryanlandia Aug 29, 2023
089d68f
Merge pull request #1365 from appsembler/bugfix/fix-segment-replicati…
bryanlandia Aug 29, 2023
c3da2d9
Update messageId format for faked analytics.js event call
bryanlandia Aug 29, 2023
b87dee6
Merge pull request #1367 from appsembler/bugfix/update-segment-events…
bryanlandia Aug 29, 2023
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
4 changes: 2 additions & 2 deletions common/djangoapps/track/views/segmentio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,8 @@ def send_event(request, method, **params):
segment_key = helpers.get_current_site_configuration().get_secret_value('SEGMENT_KEY')
if segment_key:
data['writeKey'] = segment_key
data['messageId'] = 'ajs-' + uuid.uuid4().hex
site_response = requests.post(url, json=data)
data['messageId'] = 'ajs-next-' + uuid.uuid4().hex
site_response = requests.post(url, json=data) # noqa: F841
return HttpResponse(
main_response.content,
status=main_response.status_code,
Expand Down
30 changes: 18 additions & 12 deletions lms/templates/widgets/segment-io.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,25 @@
% if settings.LMS_SEGMENT_KEY and settings.LMS_SEGMENT_SITE:
## begin Copy from edx-platform/cms/templates/widgets/segment-io.html
## Appsembler: begin Segment Site
<script>
!function(){
var realOpen = XMLHttpRequest.prototype.open;
var originalAPI = '${settings.SEGMENT_ORIGINAL_API}';
var replicateAPI = '${settings.SEGMENT_REPLICATE_API}';
XMLHttpRequest.prototype.open = function() {
if (arguments[1].substr(0, originalAPI.length) === originalAPI) {
arguments[1] = replicateAPI + arguments[1].substr(originalAPI.length);
<script type="text/javascript">
!function(){
var originalAPI = '${settings.SEGMENT_ORIGINAL_API}';
var replicateAPI = '${settings.SEGMENT_REPLICATE_API}';
function replaceFetchResourceForSegmentSite(resource){
if (resource.substr(0, originalAPI.length) === originalAPI) {
resource = replicateAPI + resource.substr(originalAPI.length);
}
return realOpen.apply(this, arguments);
};
}();
</script>
return resource;
}
const { fetch: originalFetch } = window;
window.fetch = async (...args) => {
let [resource, config ] = args;
resource = replaceFetchResourceForSegmentSite(resource);
const response = await originalFetch(resource, config);
return response;
};
}();
</script>
## Appsembler: end Segment Site
## end Copy
% endif
Expand Down
Loading