BC-8373 - move @infra/metrics folder to @apps/helpers/metrics

hpi-schul-cloud · Jan 15, 2025 · be3a372 · be3a372
1 parent 3fb085e
commit be3a372
Show file tree

Hide file tree

Showing 18 changed files with 13 additions and 15 deletions.
diff --git a/apps/server/src/apps/fwu-learning-contents.app.ts b/apps/server/src/apps/fwu-learning-contents.app.ts
@@ -10,8 +10,7 @@ import { install as sourceMapInstall } from 'source-map-support';
 // application imports
 import { FwuLearningContentsModule } from '@modules/fwu-learning-contents/fwu-learning-contents.app.module';
 import { LegacyLogger } from '@src/core/logger';
-import { enableOpenApiDocs } from './helpers';
-import { createRequestLoggerMiddleware } from './helpers/request-logger-middleware';
+import { createRequestLoggerMiddleware, enableOpenApiDocs } from './helpers';
 
 async function bootstrap() {
 	sourceMapInstall();

diff --git a/apps/server/src/apps/h5p-editor.app.ts b/apps/server/src/apps/h5p-editor.app.ts
@@ -10,8 +10,7 @@ import { install as sourceMapInstall } from 'source-map-support';
 // application imports
 import { H5PEditorModule } from '@modules/h5p-editor/h5p-editor.app.module';
 import { LegacyLogger } from '@src/core/logger';
-import { enableOpenApiDocs } from './helpers';
-import { createRequestLoggerMiddleware } from './helpers/request-logger-middleware';
+import { createRequestLoggerMiddleware, enableOpenApiDocs } from './helpers';
 
 async function bootstrap() {
 	sourceMapInstall();

diff --git a/apps/server/src/apps/helpers/index.ts b/apps/server/src/apps/helpers/index.ts
@@ -1,3 +1,4 @@
 export * from './app-start-loggable';
-export * from './prometheus-metrics';
+export * from './metrics';
+export * from './request-logger-middleware';
 export * from './swagger';
diff --git a/apps/server/src/apps/helpers/metrics/index.ts b/apps/server/src/apps/helpers/metrics/index.ts
@@ -0,0 +1 @@
+export * from './prometheus-metrics';
diff --git a/...c/apps/helpers/prometheus-metrics.spec.ts → ...elpers/metrics/prometheus-metrics.spec.ts b/...c/apps/helpers/prometheus-metrics.spec.ts → ...elpers/metrics/prometheus-metrics.spec.ts
@@ -1,13 +1,13 @@
 import { createMock } from '@golevelup/ts-jest';
 import { Configuration } from '@hpi-schul-cloud/commons';
 import { IConfig } from '@hpi-schul-cloud/commons/lib/interfaces/IConfig';
+import { Logger } from '@src/core/logger';
+import express, { Express, NextFunction, Request, RequestHandler, Response } from 'express';
 import {
 	PrometheusMetricsConfig,
 	createAPIResponseTimeMetricMiddleware,
 	createPrometheusMetricsApp,
-} from '@infra/metrics';
-import { Logger } from '@src/core/logger';
-import express, { Express, NextFunction, Request, RequestHandler, Response } from 'express';
+} from './prometheus';
 import {
 	PrometheusMetricsSetupState,
 	PrometheusMetricsSetupStateLoggable,

diff --git a/...er/src/apps/helpers/prometheus-metrics.ts → ...pps/helpers/metrics/prometheus-metrics.ts b/...er/src/apps/helpers/prometheus-metrics.ts → ...pps/helpers/metrics/prometheus-metrics.ts
@@ -1,12 +1,12 @@
 import { Express } from 'express';
 
+import { LogMessage, Loggable, Logger } from '@src/core/logger';
+import { AppStartLoggable } from '../app-start-loggable';
 import {
 	PrometheusMetricsConfig,
 	createAPIResponseTimeMetricMiddleware,
 	createPrometheusMetricsApp,
-} from '@infra/metrics';
-import { LogMessage, Loggable, Logger } from '@src/core/logger';
-import { AppStartLoggable } from './app-start-loggable';
+} from './prometheus';
 
 export const enum PrometheusMetricsSetupState {
 	FEATURE_DISABLED_MIDDLEWARES_WILL_NOT_BE_CREATED = 'Prometheus metrics feature is disabled - no metrics middlewares will be added to the app',

diff --git a/.../src/infra/metrics/prometheus/app.spec.ts → ...ps/helpers/metrics/prometheus/app.spec.ts b/.../src/infra/metrics/prometheus/app.spec.ts → ...ps/helpers/metrics/prometheus/app.spec.ts
diff --git a/...erver/src/infra/metrics/prometheus/app.ts → ...rc/apps/helpers/metrics/prometheus/app.ts b/...erver/src/infra/metrics/prometheus/app.ts → ...rc/apps/helpers/metrics/prometheus/app.ts
diff --git a/...c/infra/metrics/prometheus/config.spec.ts → ...helpers/metrics/prometheus/config.spec.ts b/...c/infra/metrics/prometheus/config.spec.ts → ...helpers/metrics/prometheus/config.spec.ts
diff --git a/...er/src/infra/metrics/prometheus/config.ts → ...apps/helpers/metrics/prometheus/config.ts b/...er/src/infra/metrics/prometheus/config.ts → ...apps/helpers/metrics/prometheus/config.ts
diff --git a/.../infra/metrics/prometheus/handler.spec.ts → ...elpers/metrics/prometheus/handler.spec.ts b/.../infra/metrics/prometheus/handler.spec.ts → ...elpers/metrics/prometheus/handler.spec.ts
diff --git a/...r/src/infra/metrics/prometheus/handler.ts → ...pps/helpers/metrics/prometheus/handler.ts b/...r/src/infra/metrics/prometheus/handler.ts → ...pps/helpers/metrics/prometheus/handler.ts
diff --git a/...ver/src/infra/metrics/prometheus/index.ts → .../apps/helpers/metrics/prometheus/index.ts b/...ver/src/infra/metrics/prometheus/index.ts → .../apps/helpers/metrics/prometheus/index.ts
diff --git a/...fra/metrics/prometheus/middleware.spec.ts → ...ers/metrics/prometheus/middleware.spec.ts b/...fra/metrics/prometheus/middleware.spec.ts → ...ers/metrics/prometheus/middleware.spec.ts
diff --git a/...rc/infra/metrics/prometheus/middleware.ts → .../helpers/metrics/prometheus/middleware.ts b/...rc/infra/metrics/prometheus/middleware.ts → .../helpers/metrics/prometheus/middleware.ts
diff --git a/apps/server/src/apps/management.app.ts b/apps/server/src/apps/management.app.ts
@@ -8,8 +8,7 @@ import { MikroORM } from '@mikro-orm/core';
 import { ManagementServerModule } from '@modules/management/management-server.app.module';
 import { LegacyLogger } from '@src/core/logger';
 import { install as sourceMapInstall } from 'source-map-support';
-import { enableOpenApiDocs } from './helpers';
-import { createRequestLoggerMiddleware } from './helpers/request-logger-middleware';
+import { createRequestLoggerMiddleware, enableOpenApiDocs } from './helpers';
 import legacyAppPromise = require('../../../../src/app');
 
 async function bootstrap(): Promise<void> {

diff --git a/apps/server/src/apps/server.app.ts b/apps/server/src/apps/server.app.ts
@@ -27,9 +27,9 @@ import {
 	addPrometheusMetricsMiddlewaresIfEnabled,
 	AppStartLoggable,
 	createAndStartPrometheusMetricsAppIfEnabled,
+	createRequestLoggerMiddleware,
 	enableOpenApiDocs,
 } from './helpers';
-import { createRequestLoggerMiddleware } from './helpers/request-logger-middleware';
 import legacyAppPromise = require('../../../../src/app');
 
 async function bootstrap() {

diff --git a/apps/server/src/infra/metrics/index.ts b/apps/server/src/infra/metrics/index.ts