From d8b5715bfc5d22ea0cb8bd271bb056c7f226bc7c Mon Sep 17 00:00:00 2001 From: Bryce Kalow Date: Fri, 22 Mar 2024 17:26:25 -0500 Subject: [PATCH 1/2] chore(nextjs): Adds telemetry event to clerkMiddleware initialization --- packages/nextjs/src/server/clerkClient.ts | 2 ++ packages/nextjs/src/server/clerkMiddleware.ts | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/packages/nextjs/src/server/clerkClient.ts b/packages/nextjs/src/server/clerkClient.ts index 32d4c41d395..41b6559b5a3 100644 --- a/packages/nextjs/src/server/clerkClient.ts +++ b/packages/nextjs/src/server/clerkClient.ts @@ -6,6 +6,7 @@ import { DOMAIN, IS_SATELLITE, PROXY_URL, + PUBLISHABLE_KEY, SDK_METADATA, SECRET_KEY, TELEMETRY_DEBUG, @@ -14,6 +15,7 @@ import { const clerkClient = createClerkClient({ secretKey: SECRET_KEY, + publishableKey: PUBLISHABLE_KEY, apiUrl: API_URL, apiVersion: API_VERSION, userAgent: `${PACKAGE_NAME}@${PACKAGE_VERSION}`, diff --git a/packages/nextjs/src/server/clerkMiddleware.ts b/packages/nextjs/src/server/clerkMiddleware.ts index 202771ec030..030375d2c5d 100644 --- a/packages/nextjs/src/server/clerkMiddleware.ts +++ b/packages/nextjs/src/server/clerkMiddleware.ts @@ -6,6 +6,7 @@ import type { RequestState, } from '@clerk/backend/internal'; import { AuthStatus, constants, createClerkRequest, createRedirect } from '@clerk/backend/internal'; +import { eventMethodCalled } from '@clerk/shared/telemetry'; import type { NextMiddleware } from 'next/server'; import { NextResponse } from 'next/server'; @@ -64,6 +65,14 @@ export const clerkMiddleware: ClerkMiddleware = (...args: unknown[]): any => { const [request, event] = parseRequestAndEvent(args); const [handler, options] = parseHandlerAndOptions(args); + clerkClient.telemetry.record( + eventMethodCalled('clerkMiddleware', { + handler: Boolean(handler), + satellite: Boolean(options.isSatellite), + proxy: Boolean(options.proxyUrl), + }), + ); + const nextMiddleware: NextMiddleware = async (request, event) => { const clerkRequest = createClerkRequest(request); From 0a747eefad5ab8d8cf700de374d860e141baeb17 Mon Sep 17 00:00:00 2001 From: Bryce Kalow Date: Fri, 22 Mar 2024 17:27:30 -0500 Subject: [PATCH 2/2] chore(repo): Adds changeset --- .changeset/khaki-poems-press.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/khaki-poems-press.md diff --git a/.changeset/khaki-poems-press.md b/.changeset/khaki-poems-press.md new file mode 100644 index 00000000000..8d8d1e8f939 --- /dev/null +++ b/.changeset/khaki-poems-press.md @@ -0,0 +1,5 @@ +--- +'@clerk/nextjs': patch +--- + +Adds telemetry event to clerkMiddleware initialization, passes publishableKey to `createClerkClient()` internally.