Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

MM-30087 Remove direct dependency between Client4 and Rudder #7056

Merged
merged 11 commits into from
Nov 24, 2020
6 changes: 4 additions & 2 deletions components/root/root.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.

import {rudderAnalytics, Client4} from 'mattermost-redux/client';
import {Client4} from 'mattermost-redux/client';
import {rudderAnalytics, RudderTelemetryHandler} from 'mattermost-redux/client/rudder';
import PropTypes from 'prop-types';
import React from 'react';
import FastClick from 'fastclick';
Expand Down Expand Up @@ -148,7 +149,8 @@ export default class Root extends React.PureComponent {
}

if (rudderKey != null && rudderKey !== '' && this.props.telemetryEnabled) {
Client4.enableRudderEvents();
Client4.setTelemetryHandler(new RudderTelemetryHandler());

rudderAnalytics.load(rudderKey, rudderUrl);

rudderAnalytics.identify(telemetryId, {}, {
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"localforage-observable": "2.0.1",
"mark.js": "8.11.1",
"marked": "github:mattermost/marked#87769262aa02e1784570f61f4f962050e07cc335",
"mattermost-redux": "github:mattermost/mattermost-redux#71950dee7ac3b93f2f2fe4a7e78de50e7b59b288",
"mattermost-redux": "github:mattermost/mattermost-redux#1c9d6bbac7569f2a2000758a2b40a4f009043694",
"moment-timezone": "0.5.31",
"p-queue": "6.6.1",
"pdfjs-dist": "2.1.266",
Expand Down