feat: use email as main tracking field

Makefile

@@ -2,7 +2,7 @@ all: dev-setup
 
 setup-build-tools:
 	go install github.com/bufbuild/buf/cmd/buf@v1.32.2
-	go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.34.2
+	go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.36.10
 	go install connectrpc.com/connect/cmd/protoc-gen-connect-go@v1.16.2
 	go install gotest.tools/gotestsum@v1.13.0
 

cli/src/core/telemetry.ts

@@ -2,7 +2,7 @@ import crypto from 'node:crypto';
 import os from 'node:os';
 import { PostHog } from 'posthog-node';
 import { EnumStatusCode } from '@wundergraph/cosmo-connect/dist/common/common_pb';
-import { config, getBaseHeaders, getLoginDetails } from './config.js';
+import { config, getBaseHeaders } from './config.js';
 import { CreateClient } from './client/client.js';
 
 // Environment variables to allow opting out of telemetry
@@ -30,6 +30,11 @@ type PostHogFetchResponse = {
   json: () => Promise<any>;
 };
 
+type TelemetryIdentity = {
+  userEmail?: string;
+  organizationId: string;
+};
+
 const buildPostHogOkResponse = () => ({
   status: 200,
   text: () => Promise.resolve(''),
@@ -116,19 +121,12 @@ export const initTelemetry = () => {
  * Generate a consistent distinct ID
  * Uses the platform API to get the organization slug if available
  */
-const getIdentity = async (): Promise<string> => {
+const getIdentity = async (): Promise<TelemetryIdentity> => {
   try {
-    // First try to get the identity from the config file
-    const loginDetails = getLoginDetails();
-    if (loginDetails?.organizationSlug) {
-      return loginDetails.organizationSlug;
-    }
-
-    // If not found, the user might be using an API key.
-    // Call the whoAmI API to get organization information
-
     if (!apiClient) {
-      return 'anonymous';
+      return {
+        organizationId: 'anonymous',
+      };
     }
 
     const resp = await apiClient.platform.whoAmI(
@@ -139,13 +137,20 @@ const getIdentity = async (): Promise<string> => {
     );
 
     if (resp.response?.code === EnumStatusCode.OK) {
-      return resp.organizationSlug;
+      return {
+        organizationId: resp.organizationId || 'anonymous',
+        userEmail: resp.userEmail || undefined,
+      };
+    }
+  } catch (err) {
+    // skip catch, returning anonymous identity if any error occurs (e.g. network issues, not logged in, etc.)
+    if (process.env.DEBUG) {
+      console.debug('Failed to get identity for telemetry, using anonymous.', err);
     }
-
-    return 'anonymous';
-  } catch {
-    return 'anonymous';
   }
+  return {
+    organizationId: 'anonymous',
+  };
 };
 
 /**
@@ -161,7 +166,10 @@ export const capture = async (eventName: string, properties: Record<string, any>
     const metadata = getMetadata();
 
     client.capture({
-      distinctId: identity,
+      distinctId: identity.userEmail ?? identity.organizationId,
+      groups: {
+        cosmo_organization: identity.organizationId ?? '',
+      },
       event: eventName,
       properties: {
         ...metadata,