Przeglądaj źródła

Merge branch 'feat/opentelemetry' into imprv/switch-otel-enabled

Yuki Takei 1 rok temu
rodzic
commit
64b927a56f
3 zmienionych plików z 403 dodań i 553 usunięć
  1. 8 6
      apps/app/package.json
  2. 1 2
      apps/app/src/server/crowi/index.js
  3. 394 545
      pnpm-lock.yaml

+ 8 - 6
apps/app/package.json

@@ -85,12 +85,14 @@
     "@growi/slack": "workspace:^",
     "@keycloak/keycloak-admin-client": "^18.0.0",
     "@opentelemetry/api": "^1.8.0",
-    "@opentelemetry/auto-instrumentations-node": "^0.44.0",
-    "@opentelemetry/exporter-metrics-otlp-grpc": "^0.50.0",
-    "@opentelemetry/exporter-trace-otlp-grpc": "^0.50.0",
-    "@opentelemetry/sdk-metrics": "^1.23.0",
-    "@opentelemetry/sdk-node": "^0.50.0",
-    "@opentelemetry/sdk-trace-node": "^1.23.0",
+    "@opentelemetry/auto-instrumentations-node": "^0.52.1",
+    "@opentelemetry/exporter-metrics-otlp-grpc": "^0.54.2",
+    "@opentelemetry/exporter-trace-otlp-grpc": "^0.54.2",
+    "@opentelemetry/resources": "^1.27.0",
+    "@opentelemetry/semantic-conventions": "^1.27.0",
+    "@opentelemetry/sdk-metrics": "^1.27.0",
+    "@opentelemetry/sdk-node": "^0.54.2",
+    "@opentelemetry/sdk-trace-node": "^1.27.0",
     "@slack/web-api": "^6.2.4",
     "@slack/webhook": "^6.0.0",
     "JSONStream": "^1.3.5",

+ 1 - 2
apps/app/src/server/crowi/index.js

@@ -43,9 +43,8 @@ import { UserNotificationService } from '../service/user-notification';
 import { initializeYjsService } from '../service/yjs';
 import { getModelSafely, getMongoUri, mongoOptions } from '../util/mongoose-utils';
 
-import { setupModelsDependentOnCrowi } from './setup-models';
-
 import { OpenTelemetry } from './opentelemetry';
+import { setupModelsDependentOnCrowi } from './setup-models';
 
 
 const logger = loggerFactory('growi:crowi');

Plik diff jest za duży
+ 394 - 545
pnpm-lock.yaml


Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików