From 780f66330affb8cac28a4ef4bd92472d4a5d9d8e Mon Sep 17 00:00:00 2001
From: Phillip Ho <arcoraven@gmail.com>
Date: Fri, 24 Jan 2025 14:00:42 +0800
Subject: [PATCH 1/3] [service-utils] Export UsageV2 helpers

---
 .changeset/friendly-lamps-think.md            | 5 +++++
 packages/service-utils/src/cf-worker/index.ts | 1 +
 packages/service-utils/src/node/index.ts      | 3 +++
 3 files changed, 9 insertions(+)
 create mode 100644 .changeset/friendly-lamps-think.md

diff --git a/.changeset/friendly-lamps-think.md b/.changeset/friendly-lamps-think.md
new file mode 100644
index 00000000000..9ed436933c0
--- /dev/null
+++ b/.changeset/friendly-lamps-think.md
@@ -0,0 +1,5 @@
+---
+"@thirdweb-dev/service-utils": patch
+---
+
+Export usageV2 utils
diff --git a/packages/service-utils/src/cf-worker/index.ts b/packages/service-utils/src/cf-worker/index.ts
index 0702d149b0b..01baa49de7c 100644
--- a/packages/service-utils/src/cf-worker/index.ts
+++ b/packages/service-utils/src/cf-worker/index.ts
@@ -11,6 +11,7 @@ import type { AuthorizationResult } from "../core/authorize/types.js";
 import type { CoreAuthInput } from "../core/types.js";
 
 export * from "./usage.js";
+export * from "./usageV2.js";
 export * from "../core/services.js";
 export * from "../core/rateLimit/index.js";
 
diff --git a/packages/service-utils/src/node/index.ts b/packages/service-utils/src/node/index.ts
index 07f858401e8..b3e8a27958a 100644
--- a/packages/service-utils/src/node/index.ts
+++ b/packages/service-utils/src/node/index.ts
@@ -12,9 +12,12 @@ import type {
 } from "../core/authorize/index.js";
 import type { AuthorizationResult } from "../core/authorize/types.js";
 import type { CoreAuthInput } from "../core/types.js";
+
+export * from "./usageV2.js";
 export * from "../core/usage.js";
 export * from "../core/rateLimit/index.js";
 export * from "../core/services.js";
+
 type NodeServiceConfig = CoreServiceConfig;
 
 export type AuthInput = CoreAuthInput & {

From fb2b1dd38970acac8c28b77677842d658d1e4293 Mon Sep 17 00:00:00 2001
From: Phillip Ho <arcoraven@gmail.com>
Date: Fri, 24 Jan 2025 15:50:59 +0800
Subject: [PATCH 2/3] noop

---
 .changeset/friendly-lamps-think.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/friendly-lamps-think.md b/.changeset/friendly-lamps-think.md
index 9ed436933c0..31fc85c87be 100644
--- a/.changeset/friendly-lamps-think.md
+++ b/.changeset/friendly-lamps-think.md
@@ -2,4 +2,4 @@
 "@thirdweb-dev/service-utils": patch
 ---
 
-Export usageV2 utils
+Export usageV2 util functions

From d858431ed707033e119477c1b7d1713261d91b7e Mon Sep 17 00:00:00 2001
From: Phillip Ho <arcoraven@gmail.com>
Date: Fri, 24 Jan 2025 16:41:17 +0800
Subject: [PATCH 3/3] [service-utils] Pass project ID to usage2

---
 packages/service-utils/src/cf-worker/index.ts | 1 +
 packages/service-utils/src/core/usageV2.ts    | 4 ++--
 packages/service-utils/src/node/index.ts      | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/service-utils/src/cf-worker/index.ts b/packages/service-utils/src/cf-worker/index.ts
index 01baa49de7c..ea93dd8c33f 100644
--- a/packages/service-utils/src/cf-worker/index.ts
+++ b/packages/service-utils/src/cf-worker/index.ts
@@ -12,6 +12,7 @@ import type { CoreAuthInput } from "../core/types.js";
 
 export * from "./usage.js";
 export * from "./usageV2.js";
+export * from "../core/usageV2.js";
 export * from "../core/services.js";
 export * from "../core/rateLimit/index.js";
 
diff --git a/packages/service-utils/src/core/usageV2.ts b/packages/service-utils/src/core/usageV2.ts
index 8f4232bcc6a..99926f860a7 100644
--- a/packages/service-utils/src/core/usageV2.ts
+++ b/packages/service-utils/src/core/usageV2.ts
@@ -21,9 +21,9 @@ export interface UsageV2Event {
    */
   team_id: string;
   /**
-   * The client ID, if available.
+   * The project ID, if available.
    */
-  client_id?: string;
+  project_id?: string;
   /**
    * The SDK name, if available.
    */
diff --git a/packages/service-utils/src/node/index.ts b/packages/service-utils/src/node/index.ts
index b3e8a27958a..4686f135d6e 100644
--- a/packages/service-utils/src/node/index.ts
+++ b/packages/service-utils/src/node/index.ts
@@ -15,6 +15,7 @@ import type { CoreAuthInput } from "../core/types.js";
 
 export * from "./usageV2.js";
 export * from "../core/usage.js";
+export * from "../core/usageV2.js";
 export * from "../core/rateLimit/index.js";
 export * from "../core/services.js";