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.

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

feat(shared): Add opt-out support for SDK telemetry #2099

Merged
merged 7 commits into from
Nov 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 14 additions & 7 deletions packages/clerk-js/src/core/clerk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ export default class Clerk implements ClerkInterface {
#devBrowserHandler: DevBrowserHandler | null = null;
#environment?: EnvironmentResource | null;
#fapiClient: FapiClient;
#telemetry: TelemetryCollector;
#telemetry?: TelemetryCollector;
#instanceType: InstanceType;
#isReady = false;

Expand Down Expand Up @@ -308,12 +308,6 @@ export default class Clerk implements ClerkInterface {
this.#instanceType = instanceType;
}
this.#fapiClient = createFapiClient(this);
this.#telemetry = new TelemetryCollector({
clerkVersion: Clerk.version,
verbose: true,
samplingRate: 1,
publishableKey: key,
});
BaseResource.clerk = this;
}

Expand All @@ -331,6 +325,19 @@ export default class Clerk implements ClerkInterface {
...options,
};

if (this.#options.sdkMetadata) {
Clerk.sdkMetadata = this.#options.sdkMetadata;
}

this.#telemetry = new TelemetryCollector({
clerkVersion: Clerk.version,
verbose: true,
samplingRate: 1,
// @ts-expect-error -- in v5 this will always be defined
publishableKey: this.publishableKey,
...this.#options.telemetry,
});
Comment on lines +328 to +339
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved the TelemetryCollector instantiation into Clerk.load() instead of the constructor. It's much easier to pass options this way.


if (this.#options.standardBrowser) {
this.#isReady = await this.#loadInStandardBrowser();
} else {
Expand Down
6 changes: 6 additions & 0 deletions packages/gatsby-plugin-clerk/src/GatsbyClerkProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import {
import { navigate } from 'gatsby';
import React from 'react';

import { TELEMETRY_DEBUG, TELEMETRY_DISABLED } from './constants';

const SDK_METADATA = {
name: PACKAGE_NAME,
version: PACKAGE_VERSION,
Expand All @@ -28,6 +30,10 @@ export function ClerkProvider({ children, ...rest }: GatsbyClerkProviderProps) {
navigate={to => navigate(to)}
initialState={__clerk_ssr_state || {}}
sdkMetadata={SDK_METADATA}
telemetry={{
disabled: TELEMETRY_DISABLED,
debug: TELEMETRY_DEBUG,
}}
{...restProps}
>
{__clerk_ssr_interstitial_html ? (
Expand Down
4 changes: 4 additions & 0 deletions packages/gatsby-plugin-clerk/src/constants.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { apiUrlFromPublishableKey } from '@clerk/shared/apiUrlFromPublishableKey';
import { isTruthy } from '@clerk/shared/underscore';

export const PUBLISHABLE_KEY = process.env.GATSBY_CLERK_PUBLISHABLE_KEY || '';
export const API_URL = process.env.CLERK_API_URL || apiUrlFromPublishableKey(PUBLISHABLE_KEY);
Expand All @@ -7,3 +8,6 @@ export const SECRET_KEY = process.env.CLERK_SECRET_KEY || '';

export const CLERK_JS = process.env.GATSBY_CLERK_JS;
export const PROXY_URL = process.env.GATSBY_CLERK_PROXY_URL;

export const TELEMETRY_DISABLED = isTruthy(process.env.GATSBY_CLERK_TELEMETRY_DISABLED);
export const TELEMETRY_DEBUG = isTruthy(process.env.GATSBY_CLERK_TELEMETRY_DEBUG);
4 changes: 4 additions & 0 deletions packages/nextjs/src/utils/mergeNextClerkPropsWithEnv.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ export const mergeNextClerkPropsWithEnv = (props: Omit<NextClerkProviderProps, '
signUpUrl: props.signUpUrl || process.env.NEXT_PUBLIC_CLERK_SIGN_UP_URL || '',
afterSignInUrl: props.afterSignInUrl || process.env.NEXT_PUBLIC_CLERK_AFTER_SIGN_IN_URL || '',
afterSignUpUrl: props.afterSignUpUrl || process.env.NEXT_PUBLIC_CLERK_AFTER_SIGN_UP_URL || '',
telemetry: {
disabled: isTruthy(process.env.NEXT_PUBLIC_CLERK_TELEMETRY_DISABLED),
debug: isTruthy(process.env.NEXT_PUBLIC_CLERK_TELEMETRY_DEBUG),
},
sdkMetadata: {
name: PACKAGE_NAME,
version: PACKAGE_VERSION,
Expand Down
10 changes: 5 additions & 5 deletions packages/react/src/isomorphicClerk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,11 @@ export default class IsomorphicClerk {
this.options = options;
this.Clerk = Clerk;
this.mode = inBrowser() ? 'browser' : 'server';

if (!this.options.sdkMetadata) {
this.options.sdkMetadata = SDK_METADATA;
}

void this.loadClerkJS();
}

Expand Down Expand Up @@ -168,7 +173,6 @@ export default class IsomorphicClerk {
domain: this.domain,
} as any);

c.sdkMetadata = this.options.sdkMetadata ?? SDK_METADATA;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cleaning up this metadata thing by handling it in Clerk.load().

await c.load(this.options);
} else {
// Otherwise use the instantiated Clerk object
Expand All @@ -195,13 +199,9 @@ export default class IsomorphicClerk {
throw new Error('Failed to download latest ClerkJS. Contact [email protected].');
}

global.Clerk.sdkMetadata = this.options.sdkMetadata ?? SDK_METADATA;

await global.Clerk.load(this.options);
}

global.Clerk.sdkMetadata = this.options.sdkMetadata ?? { name: PACKAGE_NAME, version: PACKAGE_VERSION };

if (global.Clerk?.loaded || global.Clerk?.isReady()) {
return this.hydrateClerkJS(global.Clerk);
}
Expand Down
6 changes: 6 additions & 0 deletions packages/remix/src/client/RemixClerkProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ export function ClerkProvider({ children, ...rest }: RemixClerkProviderProps): J
__afterSignUpUrl,
__clerkJSUrl,
__clerkJSVersion,
__telemetryDisabled,
__telemetryDebug,
} = clerkState?.__internal_clerk_state || {};

React.useEffect(() => {
Expand All @@ -77,6 +79,10 @@ export function ClerkProvider({ children, ...rest }: RemixClerkProviderProps): J
afterSignUpUrl: __afterSignUpUrl,
clerkJSUrl: __clerkJSUrl,
clerkJSVersion: __clerkJSVersion,
telemetry: {
disabled: __telemetryDisabled,
debug: __telemetryDebug,
},
};

return (
Expand Down
2 changes: 2 additions & 0 deletions packages/remix/src/client/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ export type ClerkState = {
__clerk_debug: any;
__clerkJSUrl: string | undefined;
__clerkJSVersion: string | undefined;
__telemetryDisabled: boolean | undefined;
__telemetryDebug: boolean | undefined;
};
};

Expand Down
3 changes: 3 additions & 0 deletions packages/remix/src/ssr/utils.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type { AuthObject, RequestState } from '@clerk/backend';
import { constants, debugRequestState, loadInterstitialFromLocal } from '@clerk/backend';
import { isTruthy } from '@clerk/shared/underscore';
import type { AppLoadContext, defer } from '@remix-run/server-runtime';
import { json } from '@remix-run/server-runtime';
import cookie from 'cookie';
Expand Down Expand Up @@ -165,6 +166,8 @@ export function getResponseClerkState(requestState: RequestState, context: AppLo
__clerk_debug: debugRequestState(requestState),
__clerkJSUrl: getEnvVariable('CLERK_JS', context),
__clerkJSVersion: getEnvVariable('CLERK_JS_VERSION', context),
__telemetryDisabled: isTruthy(getEnvVariable('CLERK_TELEMETRY_DISABLED', context)),
__telemetryDebug: isTruthy(getEnvVariable('CLERK_TELEMETRY_DEBUG', context)),
});

const headers = observabilityHeadersFromRequestState(requestState);
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
*/
/*/
!src/
3 changes: 3 additions & 0 deletions packages/shared/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ const { name } = require('./package.json');
const config = {
displayName: name.replace('@clerk', ''),
injectGlobals: true,
globals: {
fetch: global.fetch,
},

testEnvironment: 'jsdom',
roots: ['<rootDir>/src'],
Expand Down
149 changes: 149 additions & 0 deletions packages/shared/src/__tests__/telemetry.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
import { TelemetryCollector } from '../telemetry';

jest.useFakeTimers();

const TEST_PK = 'pk_test_Zm9vLWJhci0xMy5jbGVyay5hY2NvdW50cy5kZXYk';

describe('TelemetryCollector', () => {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added some high-level tests for the collector. Most importantly, validating that events aren't sent when disabled or debug are true.

brkalow marked this conversation as resolved.
Show resolved Hide resolved
test('does nothing when disabled', async () => {
const fetchSpy = jest.spyOn(global, 'fetch');

const collector = new TelemetryCollector({
disabled: true,
publishableKey: TEST_PK,
});

collector.record('TEST_EVENT', {});

jest.runAllTimers();

expect(fetchSpy).not.toHaveBeenCalled();

fetchSpy.mockRestore();
});

test('does nothing when CLERK_TELEMETRY_DISABLED is set', async () => {
process.env.CLERK_TELEMETRY_DISABLED = '1';

const fetchSpy = jest.spyOn(global, 'fetch');

const collector = new TelemetryCollector({
publishableKey: TEST_PK,
});

collector.record('TEST_EVENT', {});

jest.runAllTimers();

expect(fetchSpy).not.toHaveBeenCalled();

fetchSpy.mockRestore();

process.env.CLERK_TELEMETRY_DISABLED = undefined;
});

test('does not send events when debug is enabled, logs them instead', async () => {
const fetchSpy = jest.spyOn(global, 'fetch');
const consoleSpy = jest.spyOn(global.console, 'log');

const collector = new TelemetryCollector({
debug: true,
publishableKey: TEST_PK,
});

collector.record('TEST_EVENT', {});

jest.runAllTimers();

expect(fetchSpy).not.toHaveBeenCalled();

expect(consoleSpy.mock.calls).toMatchInlineSnapshot(`
[
[
{
"cv": "",
"event": "TEST_EVENT",
"it": "development",
"payload": {},
"pk": "pk_test_Zm9vLWJhci0xMy5jbGVyay5hY2NvdW50cy5kZXYk",
"sdk": undefined,
"sdkv": undefined,
},
],
]
`);

consoleSpy.mockRestore();
fetchSpy.mockRestore();
});

test('enables debug via environment variable', async () => {
process.env.CLERK_TELEMETRY_DEBUG = '1';

const fetchSpy = jest.spyOn(global, 'fetch');
const consoleSpy = jest.spyOn(global.console, 'log');

const collector = new TelemetryCollector({
publishableKey: TEST_PK,
});

collector.record('TEST_EVENT', {});

jest.runAllTimers();

expect(fetchSpy).not.toHaveBeenCalled();

expect(consoleSpy.mock.calls).toMatchInlineSnapshot(`
[
[
{
"cv": "",
"event": "TEST_EVENT",
"it": "development",
"payload": {},
"pk": "pk_test_Zm9vLWJhci0xMy5jbGVyay5hY2NvdW50cy5kZXYk",
"sdk": undefined,
"sdkv": undefined,
},
],
]
`);

consoleSpy.mockRestore();
fetchSpy.mockRestore();

process.env.CLERK_TELEMETRY_DEBUG = undefined;
});

test('sends events after a delay when buffer is not full', async () => {
const fetchSpy = jest.spyOn(global, 'fetch');

const collector = new TelemetryCollector({
publishableKey: TEST_PK,
});

collector.record('TEST_EVENT', {});

jest.runAllTimers();

expect(fetchSpy).toHaveBeenCalled();

fetchSpy.mockRestore();
});

test('sends events immediately when the buffer limit is reached', async () => {
const fetchSpy = jest.spyOn(global, 'fetch');

const collector = new TelemetryCollector({
maxBufferSize: 2,
publishableKey: TEST_PK,
});

collector.record('TEST_EVENT', {});
collector.record('TEST_EVENT', {});

expect(fetchSpy).toHaveBeenCalled();

fetchSpy.mockRestore();
});
});
Loading