yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-27 15:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change analytics url endpoint, refactor all senders to the new api format

Browse Source
This commit is contained in:
ivanThePleasant 2022-09-06 09:07:11 +03:00
parent f92b4aebe6
commit 3759c2885e
8 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/core/admin/admin/src/pages/App/index.js
View File

@ -93,18 +93,16 @@ function App() {
setTelemetryProperties(properties);
try {
fetch('https://analytics.strapi.io/track', {
fetch('https://analytics.strapi.io/api/v2/track', {
method: 'POST',
body: JSON.stringify({
// This event is anonymous
event: 'didInitializeAdministration',
adminUserId: '',
deviceId,
properties: {
eventPropeties: {},
userProperties: { environment: appInfo.currentEnvironment },
groupProperties: { ...properties, projectId: uuid },
},
eventPropeties: {},
userProperties: { environment: appInfo.currentEnvironment },
groupProperties: { ...properties, projectId: uuid },
}),
headers: {
'Content-Type': 'application/json',

10
packages/core/helper-plugin/lib/src/hooks/useTracking/index.js
View File

@ -12,15 +12,13 @@ const useTracking = () => {
trackRef.current = (event, properties) => {
if (uuid) {
try {
axios.post('https://analytics.strapi.io/track', {
axios.post('https://analytics.strapi.io/api/v2/track', {
event,
adminUserId,
deviceId,
properties: {
eventProperties: { ...properties },
userProperties: {},
groupProperties: { ...telemetryProperties },
},
eventProperties: { ...properties },
userProperties: {},
groupProperties: { ...telemetryProperties },
});
} catch (err) {
// Silent

6
packages/core/strapi/lib/commands/opt-in-telemetry.js
View File

@ -53,14 +53,12 @@ const generateNewPackageJSON = (packageObj) => {
const sendEvent = async (uuid) => {
try {
await fetch('https://analytics.strapi.io/track', {
await fetch('https://analytics.strapi.io/api/v2/track', {
method: 'POST',
body: JSON.stringify({
event: 'didOptInTelemetry',
deviceId: machineID(),
properties: {
groupProperties: { projectId: uuid },
},
groupProperties: { projectId: uuid },
}),
headers: { 'Content-Type': 'application/json' },
});

6
packages/core/strapi/lib/commands/opt-out-telemetry.js
View File

@ -28,14 +28,12 @@ const writePackageJSON = async (path, file, spacing) => {
const sendEvent = async (uuid) => {
try {
await fetch('https://analytics.strapi.io/track', {
await fetch('https://analytics.strapi.io/api/v2/track', {
method: 'POST',
body: JSON.stringify({
event: 'didOptOutTelemetry',
deviceId: machineID(),
properties: {
groupProperties: { projectId: uuid },
},
groupProperties: { projectId: uuid },
}),
headers: { 'Content-Type': 'application/json' },
});

2
packages/core/strapi/lib/services/metrics/__tests__/index.test.js
View File

@ -94,7 +94,7 @@ describe('metrics', () => {
send('someEvent');
expect(fetch).toHaveBeenCalled();
expect(fetch.mock.calls[0][0]).toBe('https://analytics.strapi.io/track');
expect(fetch.mock.calls[0][0]).toBe('https://analytics.strapi.io/api/v2/track');
expect(fetch.mock.calls[0][1].method).toBe('POST');
expect(JSON.parse(fetch.mock.calls[0][1].body)).toMatchObject({
event: 'someEvent',

2
packages/core/strapi/lib/services/metrics/sender.js
View File

@ -82,7 +82,7 @@ module.exports = (strapi) => {
};
try {
const res = await fetch(`${ANALYTICS_URI}/track`, reqParams);
const res = await fetch(`${ANALYTICS_URI}/api/v2/track`, reqParams);
return res.ok;
} catch (err) {
return false;

2
packages/core/strapi/lib/utils/success.js
View File

@ -17,7 +17,7 @@ try {
process.env.npm_config_global === 'true' ||
JSON.parse(process.env.npm_config_argv).original.includes('global')
) {
fetch('https://analytics.strapi.io/track', {
fetch('https://analytics.strapi.io/api/v2/track', {
method: 'POST',
body: JSON.stringify({
event: 'didInstallStrapi',

6
packages/generators/app/lib/utils/usage.js
View File

@ -87,7 +87,7 @@ function trackEvent(event, payload) {
}
try {
return fetch('https://analytics.strapi.io/track', {
return fetch('https://analytics.strapi.io/api/v2/track', {
method: 'POST',
body: JSON.stringify({
event,
@ -108,7 +108,7 @@ function trackError({ scope, error }) {
try {
return trackEvent('didNotCreateProject', {
deviceId: scope.deviceId,
properties,
...properties,
});
} catch (err) {
/** ignore errors */
@ -122,7 +122,7 @@ function trackUsage({ event, scope, error }) {
try {
return trackEvent(event, {
deviceId: scope.deviceId,
properties,
...properties,
});
} catch (err) {
/** ignore errors */