π OpenHands: AI-Driven Development
Add cloud org id to telemetry context (#1924)
Rohit Malhotrae45376f98e8a
diff --git a/__tests__/hooks/use-telemetry-identity.test.ts b/__tests__/hooks/use-telemetry-identity.test.tsindex e19e08e791..8fae45e916 100644--- a/__tests__/hooks/use-telemetry-identity.test.ts+++ b/__tests__/hooks/use-telemetry-identity.test.ts@@ -31,7 +31,10 @@ const localBackend = { kind: "local" as const, id: "local-1" };describe("useTelemetryIdentity", () => {beforeEach(() => {vi.clearAllMocks();- useActiveBackendMock.mockReturnValue({ backend: cloudBackend });+ useActiveBackendMock.mockReturnValue({+ backend: cloudBackend,+ orgId: "org-123",+ });useSettingsMock.mockReturnValue({data: { email: "[email protected]", git_user_email: "[email protected]" },});@@ -46,6 +49,7 @@ describe("useTelemetryIdentity", () => {expect(setTelemetryCloudContextMock).toHaveBeenCalledWith({userId: "user-123",email: "[email protected]",+ orgId: "org-123",});});@@ -57,6 +61,7 @@ describe("useTelemetryIdentity", () => {expect(setTelemetryCloudContextMock).toHaveBeenLastCalledWith({userId: "user-123",email: "[email protected]",+ orgId: "org-123",});useSettingsMock.mockReturnValue({ data: {} });@@ -64,6 +69,7 @@ describe("useTelemetryIdentity", () => {expect(setTelemetryCloudContextMock).toHaveBeenLastCalledWith({userId: "user-123",email: undefined,+ orgId: "org-123",});});@@ -88,7 +94,7 @@ describe("useTelemetryIdentity", () => {});it("clears Cloud user context while a local backend is active", () => {- useActiveBackendMock.mockReturnValue({ backend: localBackend });+ useActiveBackendMock.mockReturnValue({ backend: localBackend, orgId: null });renderHook(() => useTelemetryIdentity());@@ -106,6 +112,7 @@ describe("useTelemetryIdentity", () => {expect(setTelemetryCloudContextMock).toHaveBeenLastCalledWith({userId: "user-456",email: "[email protected]",+ orgId: "org-123",});});});diff --git a/__tests__/services/telemetry.test.ts b/__tests__/services/telemetry.test.tsindex f930db5e4d..cd2493834b 100644--- a/__tests__/services/telemetry.test.ts+++ b/__tests__/services/telemetry.test.ts@@ -159,6 +159,7 @@ describe("Telemetry Service", () => {setTelemetryCloudContext({userId: "user-a",email: "[email protected]",+ orgId: "org-a",});expect(mockPosthog.identify).not.toHaveBeenCalled();@@ -173,6 +174,7 @@ describe("Telemetry Service", () => {properties: expect.objectContaining({cloud_user_id: "user-a",cloud_user_email: "[email protected]",+ cloud_org_id: "org-a",}),});});@@ -180,7 +182,11 @@ describe("Telemetry Service", () => {it("clears Cloud user context for local events", async () => {await setTelemetryConsent("granted");- setTelemetryCloudContext({ userId: "user-a", email: "[email protected]" });+ setTelemetryCloudContext({+ userId: "user-a",+ email: "[email protected]",+ orgId: "org-a",+ });setTelemetryCloudContext(null);expect(latestPostHogConfig).toBeDefined();@@ -194,6 +200,7 @@ describe("Telemetry Service", () => {properties: expect.objectContaining({cloud_user_id: null,cloud_user_email: null,+ cloud_org_id: null,}),});});diff --git a/src/hooks/use-telemetry-identity.ts b/src/hooks/use-telemetry-identity.tsindex 76af880621..adb7f4dcbb 100644--- a/src/hooks/use-telemetry-identity.ts+++ b/src/hooks/use-telemetry-identity.ts@@ -6,7 +6,7 @@ import { setTelemetryCloudContext } from "#/services/telemetry";/** Keep Cloud user event context aligned with the active backend. */export const useTelemetryIdentity = () => {- const { backend } = useActiveBackend();+ const { backend, orgId } = useActiveBackend();const { data: settings } = useSettings();const userIds = useCloudCurrentUserId();const identity = backend.kind === "cloud" ? userIds[backend.id] : undefined;@@ -27,6 +27,6 @@ export const useTelemetryIdentity = () => {return;}- setTelemetryCloudContext({ userId, email });- }, [backend.kind, email, isIdentityLoading, userId]);+ setTelemetryCloudContext({ userId, email, orgId });+ }, [backend.kind, email, isIdentityLoading, orgId, userId]);};diff --git a/src/services/telemetry-context.ts b/src/services/telemetry-context.tsindex 8228cbe13c..f4939811ce 100644--- a/src/services/telemetry-context.ts+++ b/src/services/telemetry-context.ts@@ -7,6 +7,7 @@ export type BackendConnectionMethod = "manual" | "cloud_login";export interface CloudTelemetryContextInput {userId?: string | null;email?: string | null;+ orgId?: string | null;}export interface BackendTelemetryContextInput {@@ -60,5 +61,6 @@ export function getCloudTelemetryProperties(return {cloud_user_id: normalizeOptionalProperty(context?.userId),cloud_user_email: normalizeOptionalProperty(context?.email),+ cloud_org_id: normalizeOptionalProperty(context?.orgId),};}