fix(@cubejs-client/playground): telemetry (#2727)

cube-js · May 13, 2021 · 366435a · 366435a
1 parent d472bcd
commit 366435a
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 4 deletions.
diff --git a/packages/cubejs-backend-shared/src/env.ts b/packages/cubejs-backend-shared/src/env.ts
@@ -241,6 +241,9 @@ const variables: Record<string, (...args: any) => any> = {
   livePreview: () => get('CUBEJS_LIVE_PREVIEW')
     .default('false')
     .asBoolStrict(),
+  telemetry: () => get('CUBEJS_TELEMETRY')
+    .default('true')
+    .asBoolStrict(),
 };
 
 type Vars = typeof variables;

diff --git a/packages/cubejs-playground/src/App.tsx b/packages/cubejs-playground/src/App.tsx
@@ -8,7 +8,7 @@ import { RouteComponentProps, withRouter } from 'react-router';
 import Header from './components/Header';
 import GlobalStyles from './components/GlobalStyles';
 import { CubeLoader } from './atoms';
-import { event, setAnonymousId } from './events';
+import { event, setAnonymousId, setTelemetry } from './events';
 import './index.less';
 
 const selectedTab = (pathname) => {
@@ -52,6 +52,8 @@ class App extends Component<RouteComponentProps, TAppState> {
 
     const res = await fetch('/playground/context');
     const context = await res.json();
+
+    setTelemetry(context.telemetry);
     setAnonymousId(context.anonymousId, {
       coreServerVersion: context.coreServerVersion,
       projectFingerprint: context.projectFingerprint,

diff --git a/packages/cubejs-playground/src/events.ts b/packages/cubejs-playground/src/events.ts
@@ -7,8 +7,15 @@ let trackEvents: BaseEvent[] = [];
 let baseProps = {
   sentFrom: 'frontend'
 };
+let telemetry: boolean | undefined;
+
+export const setTelemetry = (isAllowed) => telemetry = isAllowed;
 
 const track = async (event) => {
+  if (telemetry !== true) {
+    return;
+  }
+
   if (!cookie('playground_anonymous')) {
     cookie('playground_anonymous', uuidv4());
   }
@@ -38,6 +45,7 @@ const track = async (event) => {
         body: JSON.stringify(toFlush.map((r) => ({ ...r, sentAt }))),
         headers: { 'Content-Type': 'application/json' },
       });
+
       if (result.status !== 200 && retries > 0) {
         return flush(toFlush, retries - 1);
       }

diff --git a/packages/cubejs-playground/src/index.tsx b/packages/cubejs-playground/src/index.tsx
@@ -16,7 +16,8 @@ import { SecurityContextProvider } from './components/SecurityContext/SecurityCo
 
 const history = createHashHistory();
 history.listen((location) => {
-  page(location);
+  const { search, ...props } = location;
+  page(props);
 });
 
 async function getToken(payload: string = '') {

diff --git a/packages/cubejs-server-core/src/core/DevServer.ts b/packages/cubejs-server-core/src/core/DevServer.ts
@@ -82,7 +82,8 @@ export class DevServer {
         projectFingerprint: this.cubejsServer.projectFingerprint,
         shouldStartConnectionWizardFlow: !this.cubejsServer.configFileExists(),
         livePreview: options.livePreview,
-        isDocker: isDocker()
+        isDocker: isDocker(),
+        telemetry: options.telemetry,
       });
     }));
 

diff --git a/packages/cubejs-server-core/src/core/server.ts b/packages/cubejs-server-core/src/core/server.ts
@@ -400,7 +400,7 @@ export class CubejsServerCore {
       externalDriverFactory,
       externalDialectFactory,
       apiSecret: process.env.CUBEJS_API_SECRET,
-      telemetry: process.env.CUBEJS_TELEMETRY !== 'false',
+      telemetry: getEnv('telemetry'),
       scheduledRefreshTimeZones: process.env.CUBEJS_SCHEDULED_REFRESH_TIMEZONES &&
         process.env.CUBEJS_SCHEDULED_REFRESH_TIMEZONES.split(',').map(t => t.trim()),
       scheduledRefreshContexts: async () => [null],