diff --git a/packages/shared/src/telemetry/README.md b/packages/shared/src/telemetry/README.md index 50ae8992b33..eaa75efee24 100644 --- a/packages/shared/src/telemetry/README.md +++ b/packages/shared/src/telemetry/README.md @@ -143,6 +143,13 @@ exposes the `TelemetryTransport` seam on `TelemetryClient`: `source_ref_hashed` stays `true` for them. - The transport can capture per-event context at track time. That context is never added to the collector envelope. +- Background work (heartbeat runs, routine runs, connection invocations, and + interactions) has no request. The server emit site wraps the track call in + `withTelemetryCompany(companyId, fn)` from + `server/src/telemetry-company-scope.ts`, with the company of the entity it + reports on. Only the direct transport reads this scope, and it uses it only + when no live request supplies a company. The collector envelope and the + dimensions do not change. Cloud is Paperclip's own service under the Cloud terms, so its events carry real identifiers: raw agent and task ids, the stack id, and the company and diff --git a/server/src/__tests__/agent-task-run-telemetry.test.ts b/server/src/__tests__/agent-task-run-telemetry.test.ts index 87dbf7a26a3..abf11fd70fb 100644 --- a/server/src/__tests__/agent-task-run-telemetry.test.ts +++ b/server/src/__tests__/agent-task-run-telemetry.test.ts @@ -6,6 +6,7 @@ import { getEmbeddedPostgresTestSupport, startEmbeddedPostgresTestDatabase, } from "./helpers/embedded-postgres.js"; +import { scopedTelemetryCompanyId } from "../telemetry-company-scope.js"; const mockTelemetryClient = vi.hoisted(() => ({ track: vi.fn() })); const mockTrackAgentTaskRun = vi.hoisted(() => vi.fn()); @@ -105,6 +106,20 @@ describeEmbeddedPostgres("emitAgentTaskRun", () => { } }); + it("tracks agent.task_run in the run's company scope", async () => { + await seedCompanyAndAgent(); + const [run] = await db.insert(heartbeatRuns).values({ companyId, agentId, status: "succeeded" }).returning(); + const scopedCompanies: Array = []; + const recordScope = () => scopedCompanies.push(scopedTelemetryCompanyId()); + mockTrackAgentTaskRun.mockImplementationOnce(recordScope).mockImplementationOnce(recordScope); + + await emitAgentTaskRun(db, run); + await emitAgentTaskRunById(db, { runId: run.id, companyId }); + + expect(scopedCompanies).toEqual([companyId, companyId]); + expect(scopedTelemetryCompanyId()).toBeUndefined(); + }); + it("emits the same event from a small scoped run read without loading execution payloads", async () => { await seedCompanyAndAgent(); const payload = randomBytes(128 * 1024).toString("base64"); diff --git a/server/src/__tests__/heartbeat-process-recovery.test.ts b/server/src/__tests__/heartbeat-process-recovery.test.ts index 1f5d3d40020..a0865338dcf 100644 --- a/server/src/__tests__/heartbeat-process-recovery.test.ts +++ b/server/src/__tests__/heartbeat-process-recovery.test.ts @@ -124,6 +124,7 @@ import { getEmbeddedPostgresTestSupport, startEmbeddedPostgresTestDatabase, } from "./helpers/embedded-postgres.js"; +import { scopedTelemetryCompanyId } from "../telemetry-company-scope.js"; import type { EnvironmentLease } from "@paperclipai/shared"; import type { NativeExecutionInput } from "../vendor/paperclip-runner/index.js"; import { runningProcesses, type AdapterExecutionContext, type AdapterExecutionResult } from "../adapters/index.ts"; @@ -10035,11 +10036,13 @@ describeEmbeddedPostgres("heartbeat orphaned process recovery", () => { }); it("tracks the first heartbeat with the agent role instead of adapter type", async () => { - const { agentId, runId } = await seedRunFixture({ + const { companyId, agentId, runId } = await seedRunFixture({ agentStatus: "running", includeIssue: false, }); const heartbeat = heartbeatService(db); + const scopedCompanies: Array = []; + mockTrackAgentFirstHeartbeat.mockImplementationOnce(() => scopedCompanies.push(scopedTelemetryCompanyId())); await heartbeat.cancelRun(runId); @@ -10050,6 +10053,7 @@ describeEmbeddedPostgres("heartbeat orphaned process recovery", () => { agentId, }), ); + expect(scopedCompanies).toEqual([companyId]); }); it("preserves first-heartbeat telemetry after a timer interval claim", async () => { diff --git a/server/src/__tests__/issue-telemetry-routes.test.ts b/server/src/__tests__/issue-telemetry-routes.test.ts index a12809a58bc..bf29f4f5059 100644 --- a/server/src/__tests__/issue-telemetry-routes.test.ts +++ b/server/src/__tests__/issue-telemetry-routes.test.ts @@ -185,6 +185,9 @@ describe("issue telemetry routes", () => { }, 60_000); it("emits task-completed telemetry with the agent role, adapter type, and model", async () => { + const { scopedTelemetryCompanyId } = await import("../telemetry-company-scope.js"); + const scopedCompanies: Array = []; + mockTrackAgentTaskCompleted.mockImplementationOnce(() => scopedCompanies.push(scopedTelemetryCompanyId())); mockAgentService.getById.mockResolvedValue({ id: "agent-1", companyId: "company-1", @@ -213,6 +216,7 @@ describe("issue telemetry routes", () => { taskId: "11111111-1111-4111-8111-111111111111", }); }); + expect(scopedCompanies).toEqual(["company-1"]); }, 10_000); it("does not emit agent task-completed telemetry for board-driven completions", async () => { diff --git a/server/src/__tests__/issue-thread-interactions-telemetry.test.ts b/server/src/__tests__/issue-thread-interactions-telemetry.test.ts index 78bd4a1ca70..b89287c4b19 100644 --- a/server/src/__tests__/issue-thread-interactions-telemetry.test.ts +++ b/server/src/__tests__/issue-thread-interactions-telemetry.test.ts @@ -20,6 +20,7 @@ import { startEmbeddedPostgresTestDatabase, } from "./helpers/embedded-postgres.js"; import { issueThreadInteractionService } from "../services/issue-thread-interactions.js"; +import { scopedTelemetryCompanyId } from "../telemetry-company-scope.js"; const telemetryMocks = vi.hoisted(() => ({ track: vi.fn(), @@ -47,6 +48,7 @@ describeEmbeddedPostgres("issueThreadInteractionService telemetry", () => { beforeEach(() => { telemetryMocks.track.mockClear(); + telemetryMocks.track.mockImplementation(() => scopedTelemetryCompanyId()); telemetryMocks.getTelemetryClient.mockReturnValue({ track: telemetryMocks.track, hashPrivateRef: vi.fn((value: string) => `hashed:${value}`), @@ -135,6 +137,11 @@ describeEmbeddedPostgres("issueThreadInteractionService telemetry", () => { return calls.at(-1)?.[1] as Record; } + function scopesOf(name: string) { + return telemetryMocks.track.mock.calls.flatMap(([eventName], index) => + eventName === name ? [telemetryMocks.track.mock.results[index]?.value] : []); + } + it("emits deprecated resolver alias use at creation without interaction content", async () => { const { companyId, issueId } = await seedIssue("Deprecated alias telemetry issue title"); @@ -161,6 +168,7 @@ describeEmbeddedPostgres("issueThreadInteractionService telemetry", () => { interaction_kind: "request_confirmation", used_deprecated_resolver_policy_alias: true, }); + expect(scopesOf("interaction.created")).toEqual([companyId]); }); it("emits skipped resolution telemetry for composer Skip", async () => { @@ -197,6 +205,7 @@ describeEmbeddedPostgres("issueThreadInteractionService telemetry", () => { target_type: "none", }); expectNoRawInteractionIds(dimensions); + expect(scopesOf("interaction.resolved")).toEqual([companyId]); }); it("emits accepted suggested-task telemetry with created and skipped task counts", async () => { diff --git a/server/src/__tests__/posthog-direct-telemetry.test.ts b/server/src/__tests__/posthog-direct-telemetry.test.ts index e18bda622a9..b35b0b1b3f6 100644 --- a/server/src/__tests__/posthog-direct-telemetry.test.ts +++ b/server/src/__tests__/posthog-direct-telemetry.test.ts @@ -5,7 +5,7 @@ import path from "node:path"; import express from "express"; import request from "supertest"; import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; -import { trackAgentTaskRun, trackCompanyImported, trackRoutineCreated } from "@paperclipai/shared/telemetry"; +import { trackAgentTaskRun, trackCompanyImported, trackRoutineCreated, trackRoutineRun } from "@paperclipai/shared/telemetry"; const hoisted = vi.hoisted(() => ({ instanceRoot: "", posthogNodeLoads: 0 })); @@ -31,6 +31,7 @@ import { capturePostHogEventContext, postHogRequestContextMiddlewareForEnv, } from "../services/posthog-direct/request-context.js"; +import { withTelemetryCompany } from "../telemetry-company-scope.js"; import { serverVersion } from "../version.js"; const COLLECTOR = "http://collector.test/ingest"; @@ -120,6 +121,44 @@ describe("server telemetry sender selection", () => { ); }); + it("self-hosted: a background company scope leaves the collector envelope byte-identical", async () => { + const client = initTelemetry({ enabled: true }, { env: {} })!; + await withTelemetryCompany("company-bg", async () => { + await Promise.resolve(); + trackAgentTaskRun(client, { agentId: "agent-1", state: "succeeded" }); + trackRoutineRun(client, { source: "schedule", status: "issue_created" }); + }); + await shutdownTelemetry(); + + expect(hoisted.posthogNodeLoads).toBe(0); + expect(fetchMock).toHaveBeenCalledTimes(1); + const body = String((fetchMock.mock.calls[0]![1] as RequestInit).body); + const parsed = JSON.parse(body); + expect(body).toBe( + JSON.stringify({ + app: "paperclip", + schemaVersion: "1", + installId: readState().installId, + version: serverVersion, + events: [ + { name: "server.started", occurredAt: parsed.events[0].occurredAt, dimensions: { os_platform: process.platform } }, + { + name: "agent.task_run", + occurredAt: parsed.events[1].occurredAt, + dimensions: { agent_id: "agent-1", state: "succeeded" }, + }, + { + name: "routine.run", + occurredAt: parsed.events[2].occurredAt, + dimensions: { source: "schedule", status: "issue_created" }, + }, + ], + batchId: parsed.batchId, + }), + ); + expect(body).not.toContain("company"); + }); + it("self-hosted: ignores posthog-js tracing headers", async () => { expect(postHogRequestContextMiddlewareForEnv({})).toBeNull(); expect(postHogRequestContextMiddlewareForEnv({ PAPERCLIP_POSTHOG_PROJECT_TOKEN: "phc_test" })).toBeNull(); @@ -345,4 +384,52 @@ describe("server telemetry sender selection", () => { expect(routine.distinctId).toBe("workspace:stack-123"); expect(routine.properties).not.toHaveProperty("$session_id"); }); + + it("Cloud: background events carry the company in scope", async () => { + const posthog = fakePostHog(); + const client = initTelemetry({ enabled: true }, { env: CLOUD_ENV, postHogFactory: posthog.factory })!; + await withTelemetryCompany("company-bg", async () => { + await new Promise((resolve) => setTimeout(resolve, 1)); + trackAgentTaskRun(client, { agentId: "agent-1", state: "succeeded" }); + }); + withTelemetryCompany("company-bg", () => trackRoutineRun(client, { source: "schedule", status: "issue_created" })); + trackRoutineCreated(client); + await shutdownTelemetry(); + + const run = posthog.captured.find((message) => message.event === "agent.task_run")!; + expect(run.distinctId).toBe("workspace:stack-123"); + expect(run.properties).toMatchObject({ company_id: "company-bg", stack_id: "stack-123", $process_person_profile: false }); + expect(run.properties).not.toHaveProperty("user_id"); + const routineRun = posthog.captured.find((message) => message.event === "routine.run")!; + expect(routineRun.properties).toMatchObject({ company_id: "company-bg", stack_id: "stack-123" }); + const unscoped = posthog.captured.find((message) => message.event === "routine.created")!; + expect(unscoped.properties).not.toHaveProperty("company_id"); + }); + + it("Cloud: a live request's company wins over a background company scope", async () => { + const posthog = fakePostHog(); + initTelemetry({ enabled: true }, { env: CLOUD_ENV, postHogFactory: posthog.factory }); + const app = express(); + app.use(postHogRequestContextMiddlewareForEnv(CLOUD_ENV)!); + app.use((req, _res, next) => { + req.actor = { type: "board", userId: "user-1", source: "session" }; + next(); + }); + app.post("/companies/:companyId/routines", (_req, res) => { + withTelemetryCompany("company-bg", () => trackRoutineCreated(getTelemetryClient()!)); + res.json({}); + }); + app.post("/runs", (_req, res) => { + withTelemetryCompany("company-bg", () => trackRoutineCreated(getTelemetryClient()!)); + res.json({}); + }); + await request(app).post("/companies/company-9/routines").expect(200); + await request(app).post("/runs").expect(200); + await shutdownTelemetry(); + + const routines = posthog.captured.filter((message) => message.event === "routine.created"); + expect(routines).toHaveLength(2); + expect(routines[0]!.properties).toMatchObject({ company_id: "company-9", user_id: "user-1" }); + expect(routines[1]!.properties).toMatchObject({ company_id: "company-bg", user_id: "user-1" }); + }); }); diff --git a/server/src/__tests__/routine-run-telemetry.test.ts b/server/src/__tests__/routine-run-telemetry.test.ts index c14a5ebf46e..ef04907111d 100644 --- a/server/src/__tests__/routine-run-telemetry.test.ts +++ b/server/src/__tests__/routine-run-telemetry.test.ts @@ -21,6 +21,7 @@ import { getEmbeddedPostgresTestSupport, startEmbeddedPostgresTestDatabase, } from "./helpers/embedded-postgres.js"; +import { scopedTelemetryCompanyId } from "../telemetry-company-scope.js"; const mockTelemetryClient = vi.hoisted(() => ({ track: vi.fn() })); const mockTrackRoutineRun = vi.hoisted(() => vi.fn()); @@ -168,4 +169,14 @@ describeEmbeddedPostgres("routine run telemetry", () => { status: "issue_created", }); }); + + it("tracks a routine run in the routine's company scope", async () => { + const { routine, svc } = await seedFixture(); + const scopedCompanies: Array = []; + mockTrackRoutineRun.mockImplementationOnce(() => scopedCompanies.push(scopedTelemetryCompanyId())); + + await svc.runRoutine(routine.id, { source: "manual" }); + + expect(scopedCompanies).toEqual([routine.companyId]); + }); }); diff --git a/server/src/__tests__/tool-access-connector-telemetry.test.ts b/server/src/__tests__/tool-access-connector-telemetry.test.ts index 924787d2328..3fdacfc1fc4 100644 --- a/server/src/__tests__/tool-access-connector-telemetry.test.ts +++ b/server/src/__tests__/tool-access-connector-telemetry.test.ts @@ -26,8 +26,9 @@ import { getEmbeddedPostgresTestSupport, startEmbeddedPostgresTestDatabase, } from "./helpers/embedded-postgres.js"; +import { scopedTelemetryCompanyId } from "../telemetry-company-scope.js"; -const track = vi.fn(); +const track = vi.fn((..._args: unknown[]) => scopedTelemetryCompanyId()); const isRegisteredEventName = vi.fn(() => true); vi.mock("../telemetry.js", () => ({ getTelemetryClient: () => ({ track, isRegisteredEventName }), @@ -44,6 +45,11 @@ const describeEmbeddedPostgres = embeddedPostgresSupport.supported type Db = ReturnType; +function scopesOf(name: string) { + return track.mock.calls.flatMap(([eventName], index) => + eventName === name ? [track.mock.results[index]?.value] : []); +} + function createdEvents() { return track.mock.calls.filter(([name]) => name === "connection.created"); } @@ -235,6 +241,7 @@ describeEmbeddedPostgres("connector lifecycle telemetry (tool-access)", () => { status: "active", enabled: true, }); + expect(scopesOf("connection.created")).toEqual([company.id]); }, 30_000); it("updateConnection emits committed transitions only; metadata saves stay silent", async () => { @@ -266,6 +273,7 @@ describeEmbeddedPostgres("connector lifecycle telemetry (tool-access)", () => { previous_status: "active", status: "active", }); + expect(scopesOf("connection.updated")).toEqual([company.id]); track.mockClear(); await svc.updateConnection(connection.id, { name: "Renamed fixture" }); diff --git a/server/src/__tests__/tool-gateway-connector-telemetry.test.ts b/server/src/__tests__/tool-gateway-connector-telemetry.test.ts index f2d2526a6e5..1674b84e906 100644 --- a/server/src/__tests__/tool-gateway-connector-telemetry.test.ts +++ b/server/src/__tests__/tool-gateway-connector-telemetry.test.ts @@ -29,12 +29,13 @@ import { getEmbeddedPostgresTestSupport, startEmbeddedPostgresTestDatabase, } from "./helpers/embedded-postgres.js"; +import { scopedTelemetryCompanyId } from "../telemetry-company-scope.js"; // Proposal wrappers drop unregistered names inside the real client, so the // integration assertions use a client double that reports the proposed event // as registered. `track` observes exactly what the emitter would hand the // real client after schema adoption. -const track = vi.fn(); +const track = vi.fn((..._args: unknown[]) => scopedTelemetryCompanyId()); const isRegisteredEventName = vi.fn(() => true); vi.mock("../telemetry.js", () => ({ getTelemetryClient: () => ({ track, isRegisteredEventName }), @@ -236,6 +237,11 @@ async function createRemoteMcpTool(db: Db, companyId: string) { return { application: application!, connection: connection!, catalogEntry: catalogEntry! }; } +function scopesOf(name: string) { + return track.mock.calls.flatMap(([eventName], index) => + eventName === name ? [track.mock.results[index]?.value] : []); +} + async function settledEvents(expectedCount: number) { await vi.waitFor(() => { expect( @@ -336,6 +342,7 @@ describeEmbeddedPostgres("gateway connector invocation telemetry", () => { status: "succeeded", origin: "agent", }); + expect(scopesOf("connection.invoked")).toEqual([f.company.id]); }, 30_000); it("emits a single failed event when post-success audit work throws (no contradictory pair)", async () => { diff --git a/server/src/routes/issues.ts b/server/src/routes/issues.ts index ca9217a229a..6a115e1abf5 100644 --- a/server/src/routes/issues.ts +++ b/server/src/routes/issues.ts @@ -208,6 +208,7 @@ import { } from "@paperclipai/shared"; import { trackAgentTaskCompleted } from "@paperclipai/shared/telemetry"; import { getTelemetryClient } from "../telemetry.js"; +import { withTelemetryCompany } from "../telemetry-company-scope.js"; import { isUniqueViolation } from "../db-errors.js"; import type { StorageService } from "../storage/types.js"; import { validate, validateIssueMutationBody } from "../middleware/validate.js"; @@ -16704,13 +16705,13 @@ export function issueRoutes( typeof actorAgent.adapterConfig?.model === "string" ? actorAgent.adapterConfig.model : undefined; - trackAgentTaskCompleted(tc, { + withTelemetryCompany(issue.companyId, () => trackAgentTaskCompleted(tc, { agentRole: actorAgent.role, agentId: actorAgent.id, adapterType: actorAgent.adapterType, model, taskId: issue.id, - }); + })); } } } diff --git a/server/src/services/agent-task-run-telemetry.ts b/server/src/services/agent-task-run-telemetry.ts index d9df8afeeef..a80243d9363 100644 --- a/server/src/services/agent-task-run-telemetry.ts +++ b/server/src/services/agent-task-run-telemetry.ts @@ -4,10 +4,11 @@ import { trackAgentTaskRun } from "@paperclipai/shared/telemetry"; import { parseObject } from "../adapters/utils.js"; import { logger } from "../middleware/logger.js"; import { getTelemetryClient } from "../telemetry.js"; +import { withTelemetryCompany } from "../telemetry-company-scope.js"; type HeartbeatRun = typeof heartbeatRuns.$inferSelect; type TelemetryRun = Pick; + "id" | "companyId" | "agentId" | "status" | "startedAt" | "finishedAt" | "usageJson" | "contextSnapshot">; function readNonEmptyString(value: unknown): string | null { return typeof value === "string" && value.trim().length > 0 @@ -79,7 +80,7 @@ export async function emitAgentTaskRun(db: Db, run: TelemetryRun): Promise readNonEmptyString(parseObject(run.contextSnapshot).issueId) ?? undefined; - trackAgentTaskRun(client, { + withTelemetryCompany(run.companyId, () => trackAgentTaskRun(client, { agentId: run.agentId, state: run.status, ...(agent @@ -116,7 +117,7 @@ export async function emitAgentTaskRun(db: Db, run: TelemetryRun): Promise } : {}), ...(taskId ? { taskId } : {}), - }); + })); } catch (err) { logger.warn( { err, runId: run.id }, @@ -134,6 +135,7 @@ export async function emitAgentTaskRunById( const run = await db .select({ id: heartbeatRuns.id, + companyId: heartbeatRuns.companyId, agentId: heartbeatRuns.agentId, status: heartbeatRuns.status, startedAt: heartbeatRuns.startedAt, diff --git a/server/src/services/connector-telemetry.ts b/server/src/services/connector-telemetry.ts index c1b05b134e3..0f314aa7ba1 100644 --- a/server/src/services/connector-telemetry.ts +++ b/server/src/services/connector-telemetry.ts @@ -8,6 +8,7 @@ import { } from "@paperclipai/shared/telemetry"; import { logger } from "../middleware/logger.js"; import { getTelemetryClient } from "../telemetry.js"; +import { withTelemetryCompany } from "../telemetry-company-scope.js"; type ToolConnectionRow = typeof toolConnections.$inferSelect; type ToolInvocationRow = typeof toolInvocations.$inferSelect; @@ -93,14 +94,14 @@ export function emitConnectionCreated( const client = getTelemetryClient(); if (!client) return; if (!isToolPurpose(connection)) return; - trackConnectionCreated(client, { + withTelemetryCompany(connection.companyId, () => trackConnectionCreated(client, { connector_key: connectorKeyForConnection(connection), transport: connection.transport, auth_kind: connection.authKind, setup_flow: setupFlow, status: connection.status, enabled: connection.enabled, - }); + })); } catch (err) { logger.warn( { err, connectionId: connection.id }, @@ -131,7 +132,7 @@ export function emitConnectionUpdated( ) { return; } - trackConnectionUpdated(client, { + withTelemetryCompany(connection.companyId, () => trackConnectionUpdated(client, { connector_key: connectorKeyForConnection(connection), transport: connection.transport, auth_kind: connection.authKind, @@ -140,7 +141,7 @@ export function emitConnectionUpdated( status: connection.status, previous_enabled: previous.enabled, enabled: connection.enabled, - }); + })); } catch (err) { logger.warn( { err, connectionId: connection.id }, @@ -212,13 +213,13 @@ export async function emitConnectionInvoked( ? Math.max(0, Math.round((completedAtMs - startedAtMs) / 1000)) : undefined; - trackConnectionInvoked(client, { + withTelemetryCompany(connection.companyId, () => trackConnectionInvoked(client, { connector_key: connectorKeyForConnection(connection), transport: connection.transport, status: invocation.status, origin: invocationOrigin(invocation), ...(durationSeconds === undefined ? {} : { duration_seconds: durationSeconds }), - }); + })); } catch (err) { logger.warn( { err, invocationId }, diff --git a/server/src/services/heartbeat/agent-status.ts b/server/src/services/heartbeat/agent-status.ts index 511f1da9909..251b5794a6c 100644 --- a/server/src/services/heartbeat/agent-status.ts +++ b/server/src/services/heartbeat/agent-status.ts @@ -5,6 +5,7 @@ import { agents, heartbeatRuns, type Db } from "@paperclipai/db"; import { and, asc, desc, eq, lte, sql } from "drizzle-orm"; import { trackAgentFirstHeartbeat } from "@paperclipai/shared/telemetry"; import { getTelemetryClient } from "../../telemetry.js"; +import { withTelemetryCompany } from "../../telemetry-company-scope.js"; import { logActivity, publishActivity, type ActivityPublication } from "../activity-log.js"; import { publishLiveEvent } from "../live-events.js"; import { finishedIdleRun, finishedIdleWake, finishedFailedIdleLease } from "../idle-work-proof.js"; @@ -116,7 +117,7 @@ export function createHeartbeatAgentStatus(db: Db) { if (!result?.updated) return; if (result.isFirstHeartbeat) { const client = getTelemetryClient(); - if (client) trackAgentFirstHeartbeat(client, { agentRole: result.updated.role, agentId: result.updated.id }); + if (client) withTelemetryCompany(result.updated.companyId, () => trackAgentFirstHeartbeat(client, { agentRole: result.updated.role, agentId: result.updated.id })); } publishStatus(result.updated, outcome); } diff --git a/server/src/services/issue-thread-interactions.ts b/server/src/services/issue-thread-interactions.ts index 890ba8b47ce..fbaf441f1e7 100644 --- a/server/src/services/issue-thread-interactions.ts +++ b/server/src/services/issue-thread-interactions.ts @@ -147,6 +147,7 @@ import { z } from "zod"; import { logger } from "../middleware/logger.js"; import { conflict, forbidden, notFound, unprocessable } from "../errors.js"; import { getTelemetryClient } from "../telemetry.js"; +import { withTelemetryCompany } from "../telemetry-company-scope.js"; import { authorizationService } from "./authorization.js"; import { isCloudManagedInstance } from "./cloud-instance.js"; import { resolveDeploymentMode } from "../config-file.js"; @@ -1797,7 +1798,7 @@ async function emitInteractionResolvedTelemetry( ? (roleByAgentId.get(interaction.createdByAgentId) ?? undefined) : undefined; - trackInteractionResolved(telemetryClient, { + withTelemetryCompany(interaction.companyId, () => trackInteractionResolved(telemetryClient, { interactionKind: interaction.kind === "connection_intent" || interaction.kind === "suggest_routine" || interaction.kind === "propose_responsibility_bar" || interaction.kind === "propose_automation" @@ -1814,7 +1815,7 @@ async function emitInteractionResolvedTelemetry( }), legacyInheritedRestriction: interaction.resolverPolicyProvenance === "legacy_inherited_restriction", - }); + })); } catch (error) { console.error( "[paperclip] Failed to emit interaction.resolved telemetry", @@ -1823,7 +1824,8 @@ async function emitInteractionResolvedTelemetry( } } -function emitInteractionCreatedTelemetry(args: { +function emitInteractionCreatedTelemetry({ companyId, ...args }: { + companyId: string; interactionKind: IssueThreadInteractionKind; usedDeprecatedResolverPolicyAlias: boolean; }) { @@ -1831,7 +1833,7 @@ function emitInteractionCreatedTelemetry(args: { if (!telemetryClient) return; try { - trackInteractionCreated(telemetryClient, { + withTelemetryCompany(companyId, () => trackInteractionCreated(telemetryClient, { ...args, interactionKind: args.interactionKind === "connection_intent" || args.interactionKind === "suggest_routine" @@ -1839,7 +1841,7 @@ function emitInteractionCreatedTelemetry(args: { || args.interactionKind === "propose_dashboard_changes" ? "other" : args.interactionKind, - }); + })); } catch (error) { console.error( "[paperclip] Failed to emit interaction.created telemetry", @@ -3363,6 +3365,7 @@ export function issueThreadInteractionService( const interaction = hydrateInteraction(created) as ConnectionIntentInteraction; if (inserted) emitInteractionCreatedTelemetry({ + companyId: issue.companyId, interactionKind: "connection_intent", usedDeprecatedResolverPolicyAlias: false, }); @@ -3555,6 +3558,7 @@ export function issueThreadInteractionService( return row!; }); emitInteractionCreatedTelemetry({ + companyId: issue.companyId, interactionKind: "suggest_routine", usedDeprecatedResolverPolicyAlias: false, }); @@ -3881,6 +3885,7 @@ export function issueThreadInteractionService( return { row: row!, replacedIds: replaced.map((entry) => entry.id) }; }); emitInteractionCreatedTelemetry({ + companyId: issue.companyId, interactionKind: "propose_responsibility_bar", usedDeprecatedResolverPolicyAlias: false, }); @@ -4056,6 +4061,7 @@ export function issueThreadInteractionService( return { row: row!, replacedIds: replaced.map((entry) => entry.id) }; }); emitInteractionCreatedTelemetry({ + companyId: issue.companyId, interactionKind: "propose_dashboard_changes", usedDeprecatedResolverPolicyAlias: false, }); @@ -4231,6 +4237,7 @@ export function issueThreadInteractionService( return { row: row!, replacedIds: replaced.map((entry) => entry.id) }; }); emitInteractionCreatedTelemetry({ + companyId: issue.companyId, interactionKind: "propose_automation", usedDeprecatedResolverPolicyAlias: false, }); @@ -5457,6 +5464,7 @@ export function issueThreadInteractionService( } const interaction = hydrateInteraction(created); emitInteractionCreatedTelemetry({ + companyId: issue.companyId, interactionKind: interaction.kind, usedDeprecatedResolverPolicyAlias, }); diff --git a/server/src/services/posthog-direct/request-context.ts b/server/src/services/posthog-direct/request-context.ts index 6c1b3dbc2d8..a037e260594 100644 --- a/server/src/services/posthog-direct/request-context.ts +++ b/server/src/services/posthog-direct/request-context.ts @@ -1,6 +1,7 @@ import { AsyncLocalStorage } from "node:async_hooks"; import type { Request, RequestHandler } from "express"; import { isPostHogDirectDeliveryEnabled, resolveCloudPostHogConfig } from "../cloud-posthog-config.js"; +import { scopedTelemetryCompanyId } from "../../telemetry-company-scope.js"; /** * Request-scoped analytics context for Paperclip Cloud direct delivery. @@ -98,13 +99,18 @@ function knownCompanyId(req: Request): string | undefined { /** Snapshot of the current request's analytics context, taken at track time. */ export function capturePostHogEventContext(): PostHogEventContext | undefined { const store = storage.getStore(); - if (!store || !store.active) return undefined; const context: PostHogEventContext = {}; - const userId = actingUserId(store.req); - const companyId = knownCompanyId(store.req); - if (userId) context.userId = userId; - if (companyId) context.companyId = companyId; - if (store.sessionId) context.sessionId = store.sessionId; - if (store.windowId) context.windowId = store.windowId; + if (store?.active) { + const userId = actingUserId(store.req); + const companyId = knownCompanyId(store.req); + if (userId) context.userId = userId; + if (companyId) context.companyId = companyId; + if (store.sessionId) context.sessionId = store.sessionId; + if (store.windowId) context.windowId = store.windowId; + } + if (!context.companyId) { + const scopedCompanyId = scopedTelemetryCompanyId(); + if (scopedCompanyId) context.companyId = scopedCompanyId; + } return Object.keys(context).length > 0 ? context : undefined; } diff --git a/server/src/services/routines.ts b/server/src/services/routines.ts index fd5b6c0e35c..eaf7ba06a65 100644 --- a/server/src/services/routines.ts +++ b/server/src/services/routines.ts @@ -69,6 +69,7 @@ import { trackRoutineRun } from "@paperclipai/shared/telemetry"; import { HttpError, badRequest, conflict, forbidden, notFound, unauthorized, unprocessable } from "../errors.js"; import { logger } from "../middleware/logger.js"; import { getTelemetryClient } from "../telemetry.js"; +import { withTelemetryCompany } from "../telemetry-company-scope.js"; import { getConfiguredSecretProvider } from "../secrets/configured-provider.js"; import { issueService } from "./issues.js"; import { assertAssignableAgent } from "./agent-assignability.js"; @@ -2083,10 +2084,10 @@ export function routineService( const telemetryClient = getTelemetryClient(); if (telemetryClient) { - trackRoutineRun(telemetryClient, { + withTelemetryCompany(input.routine.companyId, () => trackRoutineRun(telemetryClient, { source: run.source, status: run.status, - }); + })); } return run; diff --git a/server/src/telemetry-company-scope.ts b/server/src/telemetry-company-scope.ts new file mode 100644 index 00000000000..6922fcce34a --- /dev/null +++ b/server/src/telemetry-company-scope.ts @@ -0,0 +1,11 @@ +import { AsyncLocalStorage } from "node:async_hooks"; + +const storage = new AsyncLocalStorage(); + +export function withTelemetryCompany(companyId: string | null | undefined, fn: () => T): T { + return companyId ? storage.run(companyId, fn) : fn(); +} + +export function scopedTelemetryCompanyId(): string | undefined { + return storage.getStore(); +} diff --git a/tests/runner-e2e/source-sdk-public-inputs.json b/tests/runner-e2e/source-sdk-public-inputs.json index bbf3767d0fe..2235e82a0a1 100644 --- a/tests/runner-e2e/source-sdk-public-inputs.json +++ b/tests/runner-e2e/source-sdk-public-inputs.json @@ -367,7 +367,7 @@ "packages/shared/src/standing-checks.ts": "7ab71e4b6984e41e1c1dfd1bddf0116041d5abf1", "packages/shared/src/subscriptions.ts": "ef70e63395ca967bbc30776b71560e96eb354a75", "packages/shared/src/summary-slot.test.ts": "5f8e222dea425f0d5bff0adb5c683087bd7cf7fb", - "packages/shared/src/telemetry/README.md": "50ae8992b33c4141de443d42c57de24357e3d0aa", + "packages/shared/src/telemetry/README.md": "eaa75efee24352f97ddc7d72b2e99be8b39a241b", "packages/shared/src/telemetry/client-types.test.ts": "3b630edda4972b929ba4decd7457f226eb9cfc5b", "packages/shared/src/telemetry/client.test.ts": "5a95f2305a393c5b2e7750b10e0ed65da0f30cf8", "packages/shared/src/telemetry/client.ts": "d6534ce8aaa6f69fb2dd03e12487db024e250a96",