chore: simplify observability (#1874)

* chore: simplify observability

* chore: add changeset

Author: vrcprl

.changeset/nine-apes-spend.md

@@ -0,0 +1,7 @@
+---
+"@lingo.dev/compiler": patch
+"@lingo.dev/_compiler": patch
+"lingo.dev": patch
+---
+
+simplify observability

demo/new-compiler-vite-react-spa/public/translations/de.json

@@ -2,15 +2,6 @@
   "version": 0.1,
   "locale": "de",
   "entries": {
-    "daa4d8839395": "{counter} mal geklickt",
-    "52ed9ee761d8": "Hallo Welt",
-    "f11fc78c3ac0": "<b0>Gemischter</b0> Inhalt <i0>Fragment</i0>",
-    "556f5956dca7": "Willkommen zur Lingo.dev Compiler Demo",
-    "02704ec4e52a": "Es extrahiert automatisch Text aus Ihrem JSX und übersetzt ihn in andere Sprachen.",
-    "de6bfb30be49": "Text, der als <code0></code0> eingefügt wird, wird nicht übersetzt: {text}",
-    "5c15bd35e916": "Um es zu übersetzen, müssen Sie es in '<'>{translatableText} '<'/> einschließen",
-    "93b50fe805b7": "Text außerhalb der Komponente wird nicht übersetzt: {externalText}",
-    "d756b03ffbf5": "Inhalte, die Text und andere Tags enthalten, werden als eine Einheit übersetzt: {translatableMixedContextFragment}",
     "8492c53cfbaf": "Über Lingo.dev",
     "8aa4fe3f0590": "Dies ist eine Demo-Anwendung, die den Lingo.dev-Compiler für automatische Übersetzungen in React-Anwendungen präsentiert.",
     "af76f667703b": "Hauptfunktionen",
@@ -21,6 +12,15 @@
     "aca12d550fe2": "Unterstützung für Server- und Client-Komponenten",
     "44a3311c3a4a": "Wie es funktioniert",
     "0add30e37450": "Der Compiler analysiert Ihre React-Komponenten zur Build-Zeit und extrahiert automatisch alle übersetzbaren Strings. Anschließend generiert er Übersetzungen mit Ihrem konfigurierten Übersetzungsanbieter.",
-    "07d84d34dd3a": "Fügen Sie einfach die Direktive \"use i18n\" am Anfang Ihrer Komponentendateien hinzu, und der Compiler erledigt den Rest!"
+    "07d84d34dd3a": "Fügen Sie einfach die Direktive \"use i18n\" am Anfang Ihrer Komponentendateien hinzu, und der Compiler erledigt den Rest!",
+    "daa4d8839395": "{counter} mal geklickt",
+    "52ed9ee761d8": "Hallo Welt",
+    "f11fc78c3ac0": "<b0>Gemischter</b0> Inhalt <i0>Fragment</i0>",
+    "556f5956dca7": "Willkommen zur Lingo.dev Compiler Demo",
+    "02704ec4e52a": "Es extrahiert automatisch Text aus Ihrem JSX und übersetzt ihn in andere Sprachen.",
+    "de6bfb30be49": "Text, der als <code0></code0> eingefügt wird, wird nicht übersetzt: {text}",
+    "5c15bd35e916": "Um es zu übersetzen, müssen Sie es in '<'>{translatableText} '<'/> einschließen",
+    "93b50fe805b7": "Text außerhalb der Komponente wird nicht übersetzt: {externalText}",
+    "d756b03ffbf5": "Inhalte, die Text und andere Tags enthalten, werden als eine Einheit übersetzt: {translatableMixedContextFragment}"
   }
 }

demo/new-compiler-vite-react-spa/public/translations/en.json

@@ -2,15 +2,6 @@
   "version": 0.1,
   "locale": "en",
   "entries": {
-    "daa4d8839395": "Clicked {counter} times",
-    "52ed9ee761d8": "Hello World",
-    "f11fc78c3ac0": "<b0>Mixed</b0> content <i0>fragment</i0>",
-    "556f5956dca7": "Welcome to Lingo.dev compiler demo",
-    "02704ec4e52a": "It automatically extract text from your JSX and translate it to other languages.",
-    "de6bfb30be49": "Text inserted as an <code0></code0> is not translated: {text}",
-    "5c15bd35e916": "To translate it you have to wrap it into the '<'>{translatableText} '<'/>",
-    "93b50fe805b7": "Text external to the component is not translated: {externalText}",
-    "d756b03ffbf5": "Content that has text and other tags inside will br translated as a single entity: {translatableMixedContextFragment}",
     "8492c53cfbaf": "About Lingo.dev",
     "8aa4fe3f0590": "This is a demo application showcasing the Lingo.dev compiler for automatic translations in React applications.",
     "af76f667703b": "Key Features",
@@ -21,6 +12,15 @@
     "aca12d550fe2": "Server and client component support",
     "44a3311c3a4a": "How It Works",
     "0add30e37450": "The compiler analyzes your React components at build time and automatically extracts all translatable strings. It then generates translations using your configured translation provider.",
-    "07d84d34dd3a": "Simply add the \"use i18n\" directive at the top of your component files, and the compiler handles the rest!"
+    "07d84d34dd3a": "Simply add the \"use i18n\" directive at the top of your component files, and the compiler handles the rest!",
+    "daa4d8839395": "Clicked {counter} times",
+    "52ed9ee761d8": "Hello World",
+    "f11fc78c3ac0": "<b0>Mixed</b0> content <i0>fragment</i0>",
+    "556f5956dca7": "Welcome to Lingo.dev compiler demo",
+    "02704ec4e52a": "It automatically extract text from your JSX and translate it to other languages.",
+    "de6bfb30be49": "Text inserted as an <code0></code0> is not translated: {text}",
+    "5c15bd35e916": "To translate it you have to wrap it into the '<'>{translatableText} '<'/>",
+    "93b50fe805b7": "Text external to the component is not translated: {externalText}",
+    "d756b03ffbf5": "Content that has text and other tags inside will br translated as a single entity: {translatableMixedContextFragment}"
   }
 }

demo/new-compiler-vite-react-spa/public/translations/es.json

@@ -2,15 +2,6 @@
   "version": 0.1,
   "locale": "es",
   "entries": {
-    "daa4d8839395": "Clicado {counter} veces",
-    "52ed9ee761d8": "Hola Mundo",
-    "f11fc78c3ac0": "Contenido <b0>mixto</b0> <i0>fragmento</i0>",
-    "556f5956dca7": "Bienvenido a la demo de Lingo.dev compiler",
-    "02704ec4e52a": "Extrae automáticamente texto de tu JSX y lo traduce a otros idiomas.",
-    "de6bfb30be49": "El texto insertado como <code0></code0> no se traduce: {text}",
-    "5c15bd35e916": "Para traducirlo tienes que envolverlo en el '<'>{translatableText} '<'/>",
-    "93b50fe805b7": "El texto externo al componente no se traduce: {externalText}",
-    "d756b03ffbf5": "El contenido que tiene texto y otras etiquetas dentro se traducirá como una sola entidad: {translatableMixedContextFragment}",
     "8492c53cfbaf": "Acerca de Lingo.dev",
     "8aa4fe3f0590": "Esta es una aplicación de demostración que muestra el compilador Lingo.dev para traducciones automáticas en aplicaciones React.",
     "af76f667703b": "Características principales",
@@ -21,6 +12,15 @@
     "aca12d550fe2": "Soporte para componentes de servidor y cliente",
     "44a3311c3a4a": "Cómo funciona",
     "0add30e37450": "El compilador analiza tus componentes de React en tiempo de compilación y extrae automáticamente todas las cadenas traducibles. Luego genera traducciones utilizando tu proveedor de traducción configurado.",
-    "07d84d34dd3a": "¡Simplemente agrega la directiva \"use i18n\" en la parte superior de tus archivos de componentes, y el compilador se encarga del resto!"
+    "07d84d34dd3a": "¡Simplemente agrega la directiva \"use i18n\" en la parte superior de tus archivos de componentes, y el compilador se encarga del resto!",
+    "daa4d8839395": "Clicado {counter} veces",
+    "52ed9ee761d8": "Hola Mundo",
+    "f11fc78c3ac0": "Contenido <b0>mixto</b0> <i0>fragmento</i0>",
+    "556f5956dca7": "Bienvenido a la demo de Lingo.dev compiler",
+    "02704ec4e52a": "Extrae automáticamente texto de tu JSX y lo traduce a otros idiomas.",
+    "de6bfb30be49": "El texto insertado como <code0></code0> no se traduce: {text}",
+    "5c15bd35e916": "Para traducirlo tienes que envolverlo en el '<'>{translatableText} '<'/>",
+    "93b50fe805b7": "El texto externo al componente no se traduce: {externalText}",
+    "d756b03ffbf5": "El contenido que tiene texto y otras etiquetas dentro se traducirá como una sola entidad: {translatableMixedContextFragment}"
   }
 }

demo/new-compiler-vite-react-spa/public/translations/fr.json

@@ -2,15 +2,6 @@
   "version": 0.1,
   "locale": "fr",
   "entries": {
-    "daa4d8839395": "Cliqué {counter} fois",
-    "52ed9ee761d8": "Bonjour le monde",
-    "f11fc78c3ac0": "<b0>Contenu</b0> mixte <i0>fragment</i0>",
-    "556f5956dca7": "Bienvenue dans la démo du compilateur Lingo.dev",
-    "02704ec4e52a": "Il extrait automatiquement le texte de votre JSX et le traduit dans d'autres langues.",
-    "de6bfb30be49": "Le texte inséré comme un <code0></code0> n'est pas traduit : {text}",
-    "5c15bd35e916": "Pour le traduire, vous devez l'envelopper dans le '<'>{translatableText} '<'/>",
-    "93b50fe805b7": "Le texte externe au composant n'est pas traduit : {externalText}",
-    "d756b03ffbf5": "Le contenu qui contient du texte et d'autres balises sera traduit comme une seule entité : {translatableMixedContextFragment}",
     "8492c53cfbaf": "À propos de Lingo.dev",
     "8aa4fe3f0590": "Ceci est une application de démonstration présentant le compilateur Lingo.dev pour les traductions automatiques dans les applications React.",
     "af76f667703b": "Fonctionnalités clés",
@@ -21,6 +12,15 @@
     "aca12d550fe2": "Prise en charge des composants serveur et client",
     "44a3311c3a4a": "Comment ça fonctionne",
     "0add30e37450": "Le compilateur analyse vos composants React au moment de la compilation et extrait automatiquement toutes les chaînes traduisibles. Il génère ensuite des traductions en utilisant votre fournisseur de traduction configuré.",
-    "07d84d34dd3a": "Ajoutez simplement la directive \"use i18n\" en haut de vos fichiers de composants, et le compilateur s'occupe du reste !"
+    "07d84d34dd3a": "Ajoutez simplement la directive \"use i18n\" en haut de vos fichiers de composants, et le compilateur s'occupe du reste !",
+    "daa4d8839395": "Cliqué {counter} fois",
+    "52ed9ee761d8": "Bonjour le monde",
+    "f11fc78c3ac0": "<b0>Contenu</b0> mixte <i0>fragment</i0>",
+    "556f5956dca7": "Bienvenue dans la démo du compilateur Lingo.dev",
+    "02704ec4e52a": "Il extrait automatiquement le texte de votre JSX et le traduit dans d'autres langues.",
+    "de6bfb30be49": "Le texte inséré comme un <code0></code0> n'est pas traduit : {text}",
+    "5c15bd35e916": "Pour le traduire, vous devez l'envelopper dans le '<'>{translatableText} '<'/>",
+    "93b50fe805b7": "Le texte externe au composant n'est pas traduit : {externalText}",
+    "d756b03ffbf5": "Le contenu qui contient du texte et d'autres balises sera traduit comme une seule entité : {translatableMixedContextFragment}"
   }
 }

packages/cli/src/cli/utils/observability.ts

@@ -1,7 +1,7 @@
 import pkg from "node-machine-id";
 const { machineIdSync } = pkg;
 import https from "https";
-import { getRepositoryId } from "./repository-id";
+import { getOrgId } from "./org-id";
 
 const POSTHOG_API_KEY = "phc_eR0iSoQufBxNY36k0f0T15UvHJdTfHlh8rJcxsfhfXk";
 const POSTHOG_HOST = "eu.i.posthog.com";
@@ -12,23 +12,23 @@ const TRACKING_VERSION = "2.0";
 function determineDistinctId(email: string | null | undefined): {
   distinct_id: string;
   distinct_id_source: string;
-  project_id: string | null;
+  org_id: string | null;
 } {
+  const orgId = getOrgId();
+
   if (email) {
-    const projectId = getRepositoryId();
     return {
       distinct_id: email,
       distinct_id_source: "email",
-      project_id: projectId,
+      org_id: orgId,
     };
   }
 
-  const repoId = getRepositoryId();
-  if (repoId) {
+  if (orgId) {
     return {
-      distinct_id: repoId,
-      distinct_id_source: "git_repo",
-      project_id: repoId,
+      distinct_id: orgId,
+      distinct_id_source: "git_org",
+      org_id: orgId,
     };
   }
 
@@ -41,7 +41,7 @@ function determineDistinctId(email: string | null | undefined): {
   return {
     distinct_id: deviceId,
     distinct_id_source: "device",
-    project_id: null,
+    org_id: null,
   };
 }
 
@@ -74,7 +74,7 @@ export default function trackEvent(
           $lib_version: process.env.npm_package_version || "unknown",
           tracking_version: TRACKING_VERSION,
           distinct_id_source: identityInfo.distinct_id_source,
-          project_id: identityInfo.project_id,
+          org_id: identityInfo.org_id,
           node_version: process.version,
           is_ci: !!process.env.CI,
           debug_enabled: process.env.DEBUG === "true",

…/cli/src/cli/utils/repository-id.spec.ts packages/cli/src/cli/utils/org-id.spec.tspackages/cli/src/cli/utils/repository-id.spec.ts renamed to packages/cli/src/cli/utils/org-id.spec.ts packages/cli/src/cli/utils/repository-id.spec.ts renamed to packages/cli/src/cli/utils/org-id.spec.ts

@@ -1,115 +1,115 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
-import { getRepositoryId, clearRepositoryIdCache } from "./repository-id";
+import { getOrgId, clearOrgIdCache } from "./org-id";
 import { execSync } from "child_process";
 
 vi.mock("child_process");
 
-describe("getRepositoryId", () => {
+describe("getOrgId", () => {
   const originalEnv = process.env;
 
   beforeEach(() => {
     process.env = { ...originalEnv };
     vi.clearAllMocks();
-    clearRepositoryIdCache(); // Clear cache between tests
+    clearOrgIdCache(); // Clear cache between tests
   });
 
   afterEach(() => {
     process.env = originalEnv;
   });
 
   describe("CI environment variables", () => {
-    it("should detect GitHub repository from GITHUB_REPOSITORY", () => {
+    it("should detect GitHub org from GITHUB_REPOSITORY", () => {
       process.env.GITHUB_REPOSITORY = "owner/repo";
-      expect(getRepositoryId()).toBe("github:owner/071ca222");
+      expect(getOrgId()).toBe("github:owner");
     });
 
-    it("should detect GitLab repository from CI_PROJECT_PATH", () => {
+    it("should detect GitLab org from CI_PROJECT_PATH", () => {
       process.env.CI_PROJECT_PATH = "namespace/project";
-      expect(getRepositoryId()).toBe("gitlab:namespace/244210e4");
+      expect(getOrgId()).toBe("gitlab:namespace");
     });
 
-    it("should detect Bitbucket repository from BITBUCKET_REPO_FULL_NAME", () => {
+    it("should detect Bitbucket org from BITBUCKET_REPO_FULL_NAME", () => {
       process.env.BITBUCKET_REPO_FULL_NAME = "workspace/repo";
-      expect(getRepositoryId()).toBe("bitbucket:workspace/071ca222");
+      expect(getOrgId()).toBe("bitbucket:workspace");
     });
 
     it("should prioritize CI environment variables over git remote", () => {
       process.env.GITHUB_REPOSITORY = "owner/repo";
       vi.mocked(execSync).mockReturnValue(
         "git@gitlab.com:other/project.git" as any,
       );
-      expect(getRepositoryId()).toBe("github:owner/071ca222");
+      expect(getOrgId()).toBe("github:owner");
     });
   });
 
   describe("git remote URL parsing", () => {
     it("should parse GitHub SSH URL", () => {
       vi.mocked(execSync).mockReturnValue("git@github.com:owner/repo.git" as any);
-      expect(getRepositoryId()).toBe("github:owner/071ca222");
+      expect(getOrgId()).toBe("github:owner");
     });
 
     it("should parse GitHub HTTPS URL", () => {
       vi.mocked(execSync).mockReturnValue(
         "https://github.com/owner/repo.git" as any,
       );
-      expect(getRepositoryId()).toBe("github:owner/071ca222");
+      expect(getOrgId()).toBe("github:owner");
     });
 
     it("should parse GitLab SSH URL", () => {
       vi.mocked(execSync).mockReturnValue(
         "git@gitlab.com:namespace/project.git" as any,
       );
-      expect(getRepositoryId()).toBe("gitlab:namespace/244210e4");
+      expect(getOrgId()).toBe("gitlab:namespace");
     });
 
     it("should parse GitLab HTTPS URL", () => {
       vi.mocked(execSync).mockReturnValue(
         "https://gitlab.com/namespace/project.git" as any,
       );
-      expect(getRepositoryId()).toBe("gitlab:namespace/244210e4");
+      expect(getOrgId()).toBe("gitlab:namespace");
     });
 
     it("should parse Bitbucket SSH URL", () => {
       vi.mocked(execSync).mockReturnValue(
         "git@bitbucket.org:workspace/repo.git" as any,
       );
-      expect(getRepositoryId()).toBe("bitbucket:workspace/071ca222");
+      expect(getOrgId()).toBe("bitbucket:workspace");
     });
 
     it("should parse Bitbucket HTTPS URL", () => {
       vi.mocked(execSync).mockReturnValue(
         "https://bitbucket.org/workspace/repo.git" as any,
       );
-      expect(getRepositoryId()).toBe("bitbucket:workspace/071ca222");
+      expect(getOrgId()).toBe("bitbucket:workspace");
     });
 
     it("should parse self-hosted git URL with generic prefix", () => {
       vi.mocked(execSync).mockReturnValue(
         "git@custom-git.company.com:team/project.git" as any,
       );
-      expect(getRepositoryId()).toBe("git:team/244210e4");
+      expect(getOrgId()).toBe("git:team");
     });
 
     it("should handle URLs without .git extension", () => {
       vi.mocked(execSync).mockReturnValue("git@github.com:owner/repo" as any);
-      expect(getRepositoryId()).toBe("github:owner/071ca222");
+      expect(getOrgId()).toBe("github:owner");
     });
 
     it("should return null when git command fails", () => {
       vi.mocked(execSync).mockImplementation(() => {
         throw new Error("not a git repository");
       });
-      expect(getRepositoryId()).toBe(null);
+      expect(getOrgId()).toBe(null);
     });
 
     it("should return null when git remote is empty", () => {
       vi.mocked(execSync).mockReturnValue("" as any);
-      expect(getRepositoryId()).toBe(null);
+      expect(getOrgId()).toBe(null);
     });
 
     it("should return null when git remote URL is invalid", () => {
       vi.mocked(execSync).mockReturnValue("invalid-url" as any);
-      expect(getRepositoryId()).toBe(null);
+      expect(getOrgId()).toBe(null);
     });
   });
 });