Browse Source

invoke startInstrumentation at first

Yuki Takei 1 year ago
parent
commit
26694cf17f
2 changed files with 8 additions and 8 deletions
  1. 8 4
      apps/app/src/server/app.ts
  2. 0 4
      apps/app/src/server/crowi/index.js

+ 8 - 4
apps/app/src/server/app.ts

@@ -1,10 +1,11 @@
-import Logger from 'bunyan';
+import type Logger from 'bunyan';
 
+import pkg from '^/package.json';
+
+import { startInstrumentation } from '~/features/opentelemetry/server';
 import loggerFactory from '~/utils/logger';
 import { hasProcessFlag } from '~/utils/process-utils';
 
-import Crowi from './crowi';
-
 const logger: Logger = loggerFactory('growi');
 
 
@@ -21,7 +22,10 @@ process.on('unhandledRejection', (reason, p) => {
 
 async function main() {
   try {
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    // start OpenTelemetry
+    await startInstrumentation(pkg.version);
+
+    const Crowi = (await import('./crowi')).default;
     const growi = new Crowi();
     const server = await growi.start();
 

+ 0 - 4
apps/app/src/server/crowi/index.js

@@ -13,7 +13,6 @@ import pkg from '^/package.json';
 import { KeycloakUserGroupSyncService } from '~/features/external-user-group/server/service/keycloak-user-group-sync';
 import { LdapUserGroupSyncService } from '~/features/external-user-group/server/service/ldap-user-group-sync';
 import { startCronIfEnabled as startOpenaiCronIfEnabled } from '~/features/openai/server/services/cron';
-import { startInstrumentation } from '~/features/opentelemetry/server';
 import QuestionnaireService from '~/features/questionnaire/server/service/questionnaire';
 import QuestionnaireCronService from '~/features/questionnaire/server/service/questionnaire-cron';
 import loggerFactory from '~/utils/logger';
@@ -159,9 +158,6 @@ Crowi.prototype.init = async function() {
   await this.setupSessionConfig();
   this.setupCron();
 
-  // start OpenTelemetry
-  startInstrumentation(this.version);
-
   // setup messaging services
   await this.setupS2sMessagingService();
   await this.setupSocketIoService();