Skip to content

Commit 8da393b

Browse files
authored
feat(webapp): add org slug and project name to deployment telemetry events (#4785)
Adds `$trigger.org.slug` and `$trigger.project.name` attributes to the `deployment.finished` / `deployment.initialized` events (follow-up to #4778).
1 parent 38e78f8 commit 8da393b

8 files changed

Lines changed: 27 additions & 0 deletions

apps/webapp/app/v3/deploymentTelemetry.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ import { BuildServerMetadata } from "@trigger.dev/core/v3";
1515
*/
1616
export const DeploymentTelemetryAttributes = {
1717
ORG_ID: "$trigger.org.id",
18+
ORG_SLUG: "$trigger.org.slug",
1819
PROJECT_ID: "$trigger.project.id",
20+
PROJECT_NAME: "$trigger.project.name",
1921
// Project external ref ("proj_…")
2022
PROJECT_REF: "$trigger.project.ref",
2123
ENV_ID: "$trigger.env.id",

apps/webapp/app/v3/services/createDeploymentBackgroundWorkerV4.server.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,9 @@ export class CreateDeploymentBackgroundWorkerServiceV4 extends BaseService {
340340
deployment: { ...deployment, status: "FAILED", failedAt, errorData },
341341
environment: {
342342
organizationId: environment.organizationId,
343+
organizationSlug: environment.organization.slug,
343344
projectId: environment.projectId,
345+
projectName: environment.project.name,
344346
projectRef: environment.project.externalRef,
345347
environmentId: environment.id,
346348
environmentType: environment.type,

apps/webapp/app/v3/services/deployment.server.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,9 @@ export class DeploymentService extends BaseService {
256256
},
257257
environment: {
258258
organizationId: deployment.environment.project.organizationId,
259+
organizationSlug: deployment.environment.organization.slug,
259260
projectId: deployment.environment.project.id,
261+
projectName: deployment.environment.project.name,
260262
projectRef: deployment.environment.project.externalRef,
261263
environmentId: deployment.environment.id,
262264
environmentType: deployment.environment.type,
@@ -519,10 +521,14 @@ export class DeploymentService extends BaseService {
519521
project: {
520522
select: {
521523
id: true,
524+
name: true,
522525
organizationId: true,
523526
externalRef: true,
524527
},
525528
},
529+
organization: {
530+
select: { slug: true },
531+
},
526532
},
527533
},
528534
},

apps/webapp/app/v3/services/failDeployment.server.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,9 @@ export class FailDeploymentService extends BaseService {
8383
deployment: failedDeployment,
8484
environment: {
8585
organizationId: authenticatedEnv.organizationId,
86+
organizationSlug: authenticatedEnv.organization.slug,
8687
projectId: authenticatedEnv.projectId,
88+
projectName: authenticatedEnv.project.name,
8789
projectRef: authenticatedEnv.project.externalRef,
8890
environmentId: authenticatedEnv.id,
8991
environmentType: authenticatedEnv.type,

apps/webapp/app/v3/services/finalizeDeployment.server.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,9 @@ export class FinalizeDeploymentService extends BaseService {
106106
deployment: finalizedDeployment,
107107
environment: {
108108
organizationId: authenticatedEnv.organizationId,
109+
organizationSlug: authenticatedEnv.organization.slug,
109110
projectId: authenticatedEnv.projectId,
111+
projectName: authenticatedEnv.project.name,
110112
projectRef: authenticatedEnv.project.externalRef,
111113
environmentId: authenticatedEnv.id,
112114
environmentType: authenticatedEnv.type,

apps/webapp/app/v3/services/initializeDeployment.server.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,9 @@ export class InitializeDeploymentService extends BaseService {
399399
deployment,
400400
environment: {
401401
organizationId: environment.organizationId,
402+
organizationSlug: environment.organization.slug,
402403
projectId: environment.projectId,
404+
projectName: environment.project.name,
403405
projectRef: environment.project.externalRef,
404406
environmentId: environment.id,
405407
environmentType: environment.type,

apps/webapp/app/v3/services/recordDeploymentFinished.server.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ type FinishedDeployment = Pick<
3737

3838
type EnvironmentInfo = {
3939
organizationId?: string;
40+
organizationSlug?: string;
4041
projectId?: string;
42+
projectName?: string;
4143
projectRef?: string;
4244
environmentId?: string;
4345
environmentType?: string;
@@ -73,7 +75,9 @@ export function recordDeploymentFinished(params: {
7375
attributes: {
7476
[SEMINTATTRS_FORCE_RECORDING]: true,
7577
[ATTRS.ORG_ID]: environment.organizationId,
78+
[ATTRS.ORG_SLUG]: environment.organizationSlug,
7679
[ATTRS.PROJECT_ID]: environment.projectId,
80+
[ATTRS.PROJECT_NAME]: environment.projectName,
7781
[ATTRS.PROJECT_REF]: environment.projectRef,
7882
[ATTRS.ENV_ID]: environment.environmentId,
7983
[ATTRS.ENV_TYPE]: environment.environmentType,
@@ -147,7 +151,9 @@ export function recordDeploymentInitialized(params: {
147151
attributes: {
148152
[SEMINTATTRS_FORCE_RECORDING]: true,
149153
[ATTRS.ORG_ID]: environment.organizationId,
154+
[ATTRS.ORG_SLUG]: environment.organizationSlug,
150155
[ATTRS.PROJECT_ID]: environment.projectId,
156+
[ATTRS.PROJECT_NAME]: environment.projectName,
151157
[ATTRS.PROJECT_REF]: environment.projectRef,
152158
[ATTRS.ENV_ID]: environment.environmentId,
153159
[ATTRS.ENV_TYPE]: environment.environmentType,

apps/webapp/app/v3/services/timeoutDeployment.server.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ export class TimeoutDeploymentService extends BaseService {
1717
environment: {
1818
include: {
1919
project: true,
20+
organization: {
21+
select: { slug: true },
22+
},
2023
},
2124
},
2225
},
@@ -76,7 +79,9 @@ export class TimeoutDeploymentService extends BaseService {
7679
deployment: timedOutDeployment,
7780
environment: {
7881
organizationId: deployment.environment.project.organizationId,
82+
organizationSlug: deployment.environment.organization.slug,
7983
projectId: deployment.environment.projectId,
84+
projectName: deployment.environment.project.name,
8085
projectRef: deployment.environment.project.externalRef,
8186
environmentId: deployment.environmentId,
8287
environmentType: deployment.environment.type,

0 commit comments

Comments
 (0)