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 numberDiff line numberDiff 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 DownExpand 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
Copy Markdown
MemberAuthor

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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand Up@@ -168,7 +173,6 @@ export default class IsomorphicClerk {
domain: this.domain,
} as any);

c.sdkMetadata = this.options.sdkMetadata ?? SDK_METADATA;

Copy link
Copy Markdown
MemberAuthor

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 support@clerk.com.');
}

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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
*/
/*/
!src/
3 changes: 3 additions & 0 deletions packages/shared/jest.config.js
Original file line numberDiff line numberDiff 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 numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
import { TelemetryCollector } from '../telemetry';

jest.useFakeTimers();

const TEST_PK = 'pk_test_Zm9vLWJhci0xMy5jbGVyay5hY2NvdW50cy5kZXYk';

describe('TelemetryCollector', () => {

Copy link
Copy Markdown
MemberAuthor

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.

Comment thread
brkalow marked this conversation as 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
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 numberDiff line numberDiff 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 DownExpand 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
Copy Markdown
MemberAuthor

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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand Up@@ -168,7 +173,6 @@ export default class IsomorphicClerk {
domain: this.domain,
} as any);

c.sdkMetadata = this.options.sdkMetadata ?? SDK_METADATA;

Copy link
Copy Markdown
MemberAuthor

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 support@clerk.com.');
}

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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
*/
/*/
!src/
3 changes: 3 additions & 0 deletions packages/shared/jest.config.js
Original file line numberDiff line numberDiff 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 numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
import { TelemetryCollector } from '../telemetry';

jest.useFakeTimers();

const TEST_PK = 'pk_test_Zm9vLWJhci0xMy5jbGVyay5hY2NvdW50cy5kZXYk';

describe('TelemetryCollector', () => {

Copy link
Copy Markdown
MemberAuthor

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.

Comment thread
brkalow marked this conversation as 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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 numberDiff line numberDiff 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 DownExpand 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
Copy Markdown
MemberAuthor

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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand Up@@ -168,7 +173,6 @@ export default class IsomorphicClerk {
domain: this.domain,
} as any);

c.sdkMetadata = this.options.sdkMetadata ?? SDK_METADATA;

Copy link
Copy Markdown
MemberAuthor

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 support@clerk.com.');
}

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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
*/
/*/
!src/
3 changes: 3 additions & 0 deletions packages/shared/jest.config.js
Original file line numberDiff line numberDiff 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 numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
import { TelemetryCollector } from '../telemetry';

jest.useFakeTimers();

const TEST_PK = 'pk_test_Zm9vLWJhci0xMy5jbGVyay5hY2NvdW50cy5kZXYk';

describe('TelemetryCollector', () => {

Copy link
Copy Markdown
MemberAuthor

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.

Comment thread
brkalow marked this conversation as 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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 numberDiff line numberDiff 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 DownExpand 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
Copy Markdown
MemberAuthor

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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand Up@@ -168,7 +173,6 @@ export default class IsomorphicClerk {
domain: this.domain,
} as any);

c.sdkMetadata = this.options.sdkMetadata ?? SDK_METADATA;

Copy link
Copy Markdown
MemberAuthor

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 support@clerk.com.');
}

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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
*/
/*/
!src/
3 changes: 3 additions & 0 deletions packages/shared/jest.config.js
Original file line numberDiff line numberDiff 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 numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
import { TelemetryCollector } from '../telemetry';

jest.useFakeTimers();

const TEST_PK = 'pk_test_Zm9vLWJhci0xMy5jbGVyay5hY2NvdW50cy5kZXYk';

describe('TelemetryCollector', () => {

Copy link
Copy Markdown
MemberAuthor

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.

Comment thread
brkalow marked this conversation as 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
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 numberDiff line numberDiff 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 DownExpand 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
Copy Markdown
MemberAuthor

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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand Up@@ -168,7 +173,6 @@ export default class IsomorphicClerk {
domain: this.domain,
} as any);

c.sdkMetadata = this.options.sdkMetadata ?? SDK_METADATA;

Copy link
Copy Markdown
MemberAuthor

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 support@clerk.com.');
}

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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
*/
/*/
!src/
3 changes: 3 additions & 0 deletions packages/shared/jest.config.js
Original file line numberDiff line numberDiff 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 numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
import { TelemetryCollector } from '../telemetry';

jest.useFakeTimers();

const TEST_PK = 'pk_test_Zm9vLWJhci0xMy5jbGVyay5hY2NvdW50cy5kZXYk';

describe('TelemetryCollector', () => {

Copy link
Copy Markdown
MemberAuthor

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.

Comment thread
brkalow marked this conversation as 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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 numberDiff line numberDiff 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 DownExpand 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
Copy Markdown
MemberAuthor

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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand Up@@ -168,7 +173,6 @@ export default class IsomorphicClerk {
domain: this.domain,
} as any);

c.sdkMetadata = this.options.sdkMetadata ?? SDK_METADATA;

Copy link
Copy Markdown
MemberAuthor

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 support@clerk.com.');
}

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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
*/
/*/
!src/
3 changes: 3 additions & 0 deletions packages/shared/jest.config.js
Original file line numberDiff line numberDiff 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 numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
import { TelemetryCollector } from '../telemetry';

jest.useFakeTimers();

const TEST_PK = 'pk_test_Zm9vLWJhci0xMy5jbGVyay5hY2NvdW50cy5kZXYk';

describe('TelemetryCollector', () => {

Copy link
Copy Markdown
MemberAuthor

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.

Comment thread
brkalow marked this conversation as 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
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 numberDiff line numberDiff 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 DownExpand 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
Copy Markdown
MemberAuthor

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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand Up@@ -168,7 +173,6 @@ export default class IsomorphicClerk {
domain: this.domain,
} as any);

c.sdkMetadata = this.options.sdkMetadata ?? SDK_METADATA;

Copy link
Copy Markdown
MemberAuthor

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 support@clerk.com.');
}

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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
*/
/*/
!src/
3 changes: 3 additions & 0 deletions packages/shared/jest.config.js
Original file line numberDiff line numberDiff 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 numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
import { TelemetryCollector } from '../telemetry';

jest.useFakeTimers();

const TEST_PK = 'pk_test_Zm9vLWJhci0xMy5jbGVyay5hY2NvdW50cy5kZXYk';

describe('TelemetryCollector', () => {

Copy link
Copy Markdown
MemberAuthor

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.

Comment thread
brkalow marked this conversation as 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
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 numberDiff line numberDiff 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 DownExpand 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
Copy Markdown
MemberAuthor

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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand Up@@ -168,7 +173,6 @@ export default class IsomorphicClerk {
domain: this.domain,
} as any);

c.sdkMetadata = this.options.sdkMetadata ?? SDK_METADATA;

Copy link
Copy Markdown
MemberAuthor

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 support@clerk.com.');
}

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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
*/
/*/
!src/
3 changes: 3 additions & 0 deletions packages/shared/jest.config.js
Original file line numberDiff line numberDiff 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 numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
import { TelemetryCollector } from '../telemetry';

jest.useFakeTimers();

const TEST_PK = 'pk_test_Zm9vLWJhci0xMy5jbGVyay5hY2NvdW50cy5kZXYk';

describe('TelemetryCollector', () => {

Copy link
Copy Markdown
MemberAuthor

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.

Comment thread
brkalow marked this conversation as 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