Yuki Takei 11 месяцев назад
Родитель
Сommit
0db8f5d8a6

+ 7 - 1
apps/app/src/features/opentelemetry/server/node-sdk.ts

@@ -72,7 +72,7 @@ For more information, see https://docs.growi.org/en/admin-guide/admin-cookbook/t
   }
 };
 
-export const startOpenTelemetry = async(): Promise<void> => {
+export const detectServiceInstanceId = async(): Promise<void> => {
   const instrumentationEnabled = configManager.getConfig('otel:enabled', ConfigSource.env);
 
   if (instrumentationEnabled) {
@@ -84,7 +84,13 @@ export const startOpenTelemetry = async(): Promise<void> => {
     // overwrite resource
     const updatedResource = generateNodeSDKConfiguration(serviceInstanceId).resource;
     (sdkInstance as any)._resource = updatedResource;
+  }
+};
 
+export const startOpenTelemetry = (): void => {
+  const instrumentationEnabled = configManager.getConfig('otel:enabled', ConfigSource.env);
+
+  if (instrumentationEnabled) {
     sdkInstance.start();
   }
 };

+ 3 - 2
apps/app/src/server/app.ts

@@ -1,6 +1,6 @@
 import type Logger from 'bunyan';
 
-import { initInstrumentation, startOpenTelemetry } from '~/features/opentelemetry/server';
+import { initInstrumentation, detectServiceInstanceId, startOpenTelemetry } from '~/features/opentelemetry/server';
 import loggerFactory from '~/utils/logger';
 import { hasProcessFlag } from '~/utils/process-utils';
 
@@ -28,7 +28,8 @@ async function main() {
     const server = await growi.start();
 
     // Start OpenTelemetry
-    await startOpenTelemetry();
+    await detectServiceInstanceId();
+    startOpenTelemetry();
 
     if (hasProcessFlag('ci')) {
       logger.info('"--ci" flag is detected. Exit process.');