From 0b38b26308cb0467e90164c8249d32633464b577 Mon Sep 17 00:00:00 2001
From: Igor Katsuba <igor@katsuba.dev>
Date: Tue, 21 Nov 2023 10:13:56 +0200
Subject: [PATCH 1/2] feat(stats): add default metrics configuration

---
 libs/api/models/src/lib/environment.ts            | 4 ++++
 libs/api/stats/src/lib/prometheus-stats.module.ts | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/libs/api/models/src/lib/environment.ts b/libs/api/models/src/lib/environment.ts
index aa0acf9..b9cfeaf 100644
--- a/libs/api/models/src/lib/environment.ts
+++ b/libs/api/models/src/lib/environment.ts
@@ -30,5 +30,9 @@ export interface Environment {
 
   ENV: 'development' | string;
 
+  // Prometheus starts here
   METRICS_PATH: string;
+  DEFAULT_METRICS_ENABLED: boolean;
+  DEFAULT_METRICS_PREFIX: string;
+  // Prometheus ends here
 }
diff --git a/libs/api/stats/src/lib/prometheus-stats.module.ts b/libs/api/stats/src/lib/prometheus-stats.module.ts
index be70d6d..81a41e6 100644
--- a/libs/api/stats/src/lib/prometheus-stats.module.ts
+++ b/libs/api/stats/src/lib/prometheus-stats.module.ts
@@ -14,6 +14,12 @@ import { Environment } from '@nx-turbo/api-models';
     PrometheusModule.registerAsync({
       useFactory: (config: ConfigService<Environment>) => ({
         path: config.get('METRICS_PATH', '/metrics'),
+        defaultMetrics: {
+          enabled: config.get('DEFAULT_METRICS_ENABLED', true),
+          config: {
+            prefix: config.get('DEFAULT_METRICS_PREFIX', 'nx_cloud_'),
+          },
+        },
       }),
       inject: [ConfigService],
     }),

From 5bae50afde2fa41ca19c9fad652efc49f530373f Mon Sep 17 00:00:00 2001
From: Igor Katsuba <igor@katsuba.dev>
Date: Tue, 21 Nov 2023 10:30:26 +0200
Subject: [PATCH 2/2] fix(api-e2e): some fixes

---
 apps/api-e2e/tests/app.spec.ts | 2 +-
 apps/api-e2e/tests/utils.ts    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/api-e2e/tests/app.spec.ts b/apps/api-e2e/tests/app.spec.ts
index 5de9d2d..e5bc713 100644
--- a/apps/api-e2e/tests/app.spec.ts
+++ b/apps/api-e2e/tests/app.spec.ts
@@ -8,7 +8,7 @@ describe('api e2e', () => {
   beforeAll(async () => {
     createTestProject();
 
-    addPackageToPackageJson('nx-cloud');
+    addPackageToPackageJson('nx-cloud@16.4.0');
   }, 120000);
 
   afterAll(() => {
diff --git a/apps/api-e2e/tests/utils.ts b/apps/api-e2e/tests/utils.ts
index 5c5b421..f7c7975 100644
--- a/apps/api-e2e/tests/utils.ts
+++ b/apps/api-e2e/tests/utils.ts
@@ -1,5 +1,5 @@
 import { tmpProjPath } from '@nx/plugin/testing';
-import { dirname, join, basename } from 'path';
+import { dirname, basename } from 'path';
 import * as ch from 'child_process';
 import { execSync } from 'child_process';
 import { getPackageManagerCommand } from 'nx/src/utils/package-manager';
@@ -19,7 +19,7 @@ export function createTestProject() {
   });
 
   execSync(
-    `npx --yes create-nx-workspace@latest ${projectName} --preset apps --no-nxCloud --no-interactive`,
+    `npx --yes create-nx-workspace@16 ${projectName} --preset apps --no-nxCloud --no-interactive`,
     {
       cwd: dirname(projectDirectory),
       stdio: 'inherit',