Merge branch 'next' into mrk-317-workflow-trigger-integration-instruc…

…tions

.cspell.json

@@ -497,9 +497,6 @@
     "Pushwoosh",
     "pychecker",
     "pydns",
-    "pyroscope",
-    "Pyroscope",
-    "PYROSCOPE",
     "pyspf",
     "QCLASS",
     "qtype",

apps/api/package.json

@@ -23,7 +23,7 @@
     "lint:openapi": "spectral lint http://127.0.0.1:${PORT:-3000}/openapi.yaml",
     "pretest": "pnpm build:metadata",
     "test": "cross-env TS_NODE_COMPILER_OPTIONS='{\"strictNullChecks\": false}' NODE_ENV=test mocha --require ts-node/register --exit 'src/**/*.spec.ts'",
-    "test:e2e:novu-v1": "cross-env TS_NODE_COMPILER_OPTIONS='{\"strictNullChecks\": false}' NODE_ENV=test mocha --grep '#novu-v1' --require ts-node/register --exit --file e2e/setup.ts src/**/*.e2e{,-ee}.ts ",
+    "test:e2e:novu-v1": "cross-env TS_NODE_COMPILER_OPTIONS='{\"strictNullChecks\": false}' NODE_ENV=test mocha --grep '#novu-v1' --require ts-node/register --exit --file e2e/setup.ts src/**/*.e2e{,-ee}.ts",
     "test:e2e:novu-v2": "cross-env TS_NODE_COMPILER_OPTIONS='{\"strictNullChecks\": false}' NODE_ENV=test CI_EE_TEST=true CLERK_ENABLED=true NODE_OPTIONS=--max_old_space_size=8192 mocha --grep '#novu-v2' --require ts-node/register --exit --file e2e/setup.ts 'src/**/*.e2e{,-ee}.ts'",
     "migration": "cross-env NODE_ENV=local MIGRATION=true ts-node --transpileOnly",
     "link:submodules": "pnpm link ../../enterprise/packages/auth && pnpm link ../../enterprise/packages/translation && pnpm link ../../enterprise/packages/billing",

apps/api/src/app.module.ts

@@ -1,7 +1,7 @@
 /* eslint-disable global-require */
 import { DynamicModule, Logger, Module, Provider } from '@nestjs/common';
 import { APP_INTERCEPTOR } from '@nestjs/core';
-import { ProfilingModule, TracingModule } from '@novu/application-generic';
+import { TracingModule } from '@novu/application-generic';
 import { Client, NovuModule } from '@novu/framework/nest';
 
 import { Type } from '@nestjs/common/interfaces/type.interface';
@@ -110,7 +110,6 @@ const baseModules: Array<Type | DynamicModule | Promise<DynamicModule> | Forward
   WorkflowOverridesModule,
   RateLimitingModule,
   WidgetsModule,
-  ProfilingModule.register(packageJson.name),
   TracingModule.register(packageJson.name, packageJson.version),
   BridgeModule,
   PreferencesModule,

apps/web/src/components/execution-detail/ExecutionDetailsStepHeader.tsx

@@ -85,6 +85,10 @@ const generateDetailByStepAndStatus = (status, job) => {
     return `Success! ${job.executionDetails?.at(-1)?.detail}`;
   }
 
+  if (status === JobStatusEnum.FAILED) {
+    return `Failed! ${job.executionDetails?.at(-1)?.detail}`;
+  }
+
   if (job.type === StepTypeEnum.DIGEST) {
     if (status === JobStatusEnum.SKIPPED) {
       return job.executionDetails?.at(-1)?.detail;
@@ -99,7 +103,6 @@ const generateDetailByStepAndStatus = (status, job) => {
   if (job.type === StepTypeEnum.DELAY) {
     const { digest, step: stepMetadata, payload } = job;
 
-    if (!digest.amount && !digest.unit) return `Waiting to receive execution delay from bridge endpoint`;
     if (stepMetadata?.metadata?.type === DelayTypeEnum.SCHEDULED) {
       return `Delaying execution until ${payload[stepMetadata.metadata.delayPath]}`;
     }

apps/webhook/src/app.module.ts

@@ -1,11 +1,6 @@
 import { Module } from '@nestjs/common';
 
-import {
-  createNestLoggingModuleOptions,
-  LoggerModule,
-  ProfilingModule,
-  TracingModule,
-} from '@novu/application-generic';
+import { createNestLoggingModuleOptions, LoggerModule, TracingModule } from '@novu/application-generic';
 import { SentryModule } from '@sentry/nestjs/setup';
 import { AppController } from './app.controller';
 import { AppService } from './app.service';
@@ -19,7 +14,6 @@ const modules = [
   HealthModule,
   WebhooksModule,
   TracingModule.register(packageJson.name, packageJson.version),
-  ProfilingModule.register(packageJson.name),
   LoggerModule.forRoot(
     createNestLoggingModuleOptions({
       serviceName: packageJson.name,

apps/worker/src/app.module.ts

@@ -1,20 +1,17 @@
 import { DynamicModule, ForwardReference, Logger, Module, Provider, Type } from '@nestjs/common';
 
-import { ProfilingModule } from '@novu/application-generic';
 import { APP_FILTER } from '@nestjs/core';
 import { SentryGlobalFilter, SentryModule } from '@sentry/nestjs/setup';
 import { SharedModule } from './app/shared/shared.module';
 import { HealthModule } from './app/health/health.module';
 import { WorkflowModule } from './app/workflow/workflow.module';
 import { TelemetryModule } from './app/telemetry/telemetry.module';
-import packageJson from '../package.json';
 
 const modules: Array<Type | DynamicModule | Promise<DynamicModule> | ForwardReference> = [
   SharedModule,
   HealthModule,
   WorkflowModule,
   TelemetryModule,
-  ProfilingModule.register(packageJson.name),
 ];
 
 const providers: Provider[] = [];

apps/ws/src/app.module.ts

@@ -2,12 +2,7 @@ import { join } from 'path';
 import { Module } from '@nestjs/common';
 import { SentryModule } from '@sentry/nestjs/setup';
 import { ServeStaticModule } from '@nestjs/serve-static';
-import {
-  createNestLoggingModuleOptions,
-  LoggerModule,
-  ProfilingModule,
-  TracingModule,
-} from '@novu/application-generic';
+import { createNestLoggingModuleOptions, LoggerModule, TracingModule } from '@novu/application-generic';
 
 import { AppController } from './app.controller';
 import { AppService } from './app.service';
@@ -21,7 +16,6 @@ const modules = [
   SharedModule,
   HealthModule,
   TracingModule.register(packageJson.name, packageJson.version),
-  ProfilingModule.register(packageJson.name),
   SocketModule,
   LoggerModule.forRoot(
     createNestLoggingModuleOptions({

docker/local/docker-compose.yml

@@ -36,9 +36,3 @@ services:
       test: "bash -c 'redis-cli ping'"
       retries: 5
       interval: 10s
-  pyroscope:
-    image: grafana/pyroscope:latest
-    ports:
-      - '4040:4040'
-    profiles:
-      - optional

libs/application-generic/package.json

@@ -66,7 +66,6 @@
     "@opentelemetry/sdk-trace-base": "~1.19.0",
     "@opentelemetry/sdk-trace-node": "~1.19.0",
     "@opentelemetry/semantic-conventions": "~1.19.0",
-    "@pyroscope/nodejs": "^0.2.9",
     "@segment/analytics-node": "^1.1.4",
     "@sentry/node": "^8.33.1",
     "@team-plain/typescript-sdk": "5.4.3",

libs/application-generic/src/index.ts

@@ -10,7 +10,6 @@ export * from './http';
 export * from './instrumentation/index';
 export * from './logging/index';
 export * from './modules';
-export * from './profiling';
 export * from './resilience';
 export * from './services';
 export * from './tracing';