diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index d82989b747..b816d29e97 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -13,7 +13,7 @@ importers: ../../packages/measurements: devDependencies: '@hcengineering/platform-rig': - specifier: workspace:^0.7.6 + specifier: workspace:^0.7.7 version: link:../platform-rig '@types/jest': specifier: ^29.5.5 @@ -58,7 +58,7 @@ importers: ../../packages/measurements-otlp: dependencies: '@hcengineering/measurements': - specifier: workspace:^0.7.6 + specifier: workspace:^0.7.7 version: link:../measurements '@opentelemetry/api': specifier: ^1.9.0 @@ -104,7 +104,7 @@ importers: version: 2.1.0(@opentelemetry/api@1.9.0) devDependencies: '@hcengineering/platform-rig': - specifier: workspace:^0.7.6 + specifier: workspace:^0.7.7 version: link:../platform-rig '@types/jest': specifier: ^29.5.5 @@ -166,7 +166,7 @@ importers: version: 3.4.7 devDependencies: '@hcengineering/platform-rig': - specifier: workspace:^0.7.6 + specifier: workspace:^0.7.7 version: link:../platform-rig '@types/jest': specifier: ^29.5.5 diff --git a/packages/measurements-otlp/package.json b/packages/measurements-otlp/package.json index ed8d13846f..6026604f83 100644 --- a/packages/measurements-otlp/package.json +++ b/packages/measurements-otlp/package.json @@ -1,6 +1,6 @@ { "name": "@hcengineering/measurements-otlp", - "version": "0.7.6", + "version": "0.7.7", "main": "lib/index.js", "svelte": "src/index.ts", "types": "types/index.d.ts", @@ -27,7 +27,7 @@ "_phase:validate": "compile validate" }, "devDependencies": { - "@hcengineering/platform-rig": "workspace:^0.7.6", + "@hcengineering/platform-rig": "workspace:^0.7.7", "@typescript-eslint/eslint-plugin": "^6.11.0", "eslint-plugin-import": "^2.26.0", "eslint-plugin-promise": "^6.1.1", @@ -43,7 +43,7 @@ "@types/jest": "^29.5.5" }, "dependencies": { - "@hcengineering/measurements": "workspace:^0.7.6", + "@hcengineering/measurements": "workspace:^0.7.7", "@opentelemetry/sdk-node": "^0.203.0", "@opentelemetry/sdk-logs": "^0.203.0", "@opentelemetry/auto-instrumentations-node": "^0.62.0", diff --git a/packages/measurements-otlp/src/telemetry.ts b/packages/measurements-otlp/src/telemetry.ts index bf35a7c4cf..da1a492250 100644 --- a/packages/measurements-otlp/src/telemetry.ts +++ b/packages/measurements-otlp/src/telemetry.ts @@ -479,7 +479,7 @@ export function initOpenTelemetrySDK (serviceName: string, version: string): boo return true } -export function reportOTELError (error: Error): void { +export function reportOTELError (error: Error, attributes?: Record): void { if (sdkServiceName !== undefined && sdkServiceVersion !== undefined && loggerProvider !== undefined) { const otlpLogger = loggerProvider?.getLogger(sdkServiceName, sdkServiceVersion) otlpLogger?.emit({ @@ -488,6 +488,7 @@ export function reportOTELError (error: Error): void { body: error.message, context: context.active(), attributes: { + ...attributes, 'service.name': sdkServiceName, 'service.version': sdkServiceVersion, 'error.stack': error.stack @@ -496,6 +497,29 @@ export function reportOTELError (error: Error): void { } } +export function reportOTEL ( + severity: 'info' | 'warning', + message: string, + time: number, + attributes?: Record +): void { + if (sdkServiceName !== undefined && sdkServiceVersion !== undefined && loggerProvider !== undefined) { + const otlpLogger = loggerProvider?.getLogger(sdkServiceName, sdkServiceVersion) + otlpLogger?.emit({ + severityNumber: severity === 'info' ? SeverityNumber.INFO : SeverityNumber.WARN, + body: message, + severityText: severity, + timestamp: time, + context: context.active(), + attributes: { + ...attributes, + 'service.name': sdkServiceName, + 'service.version': sdkServiceVersion + } + }) + } +} + export function createOpenTelemetryMetricsContext ( name: string, params: ParamsType, diff --git a/packages/measurements/package.json b/packages/measurements/package.json index 6e7065c73b..d1ef659d4a 100644 --- a/packages/measurements/package.json +++ b/packages/measurements/package.json @@ -1,6 +1,6 @@ { "name": "@hcengineering/measurements", - "version": "0.7.6", + "version": "0.7.7", "main": "lib/index.js", "svelte": "src/index.ts", "types": "types/index.d.ts", @@ -27,7 +27,7 @@ "_phase:validate": "compile validate" }, "devDependencies": { - "@hcengineering/platform-rig": "workspace:^0.7.6", + "@hcengineering/platform-rig": "workspace:^0.7.7", "@typescript-eslint/eslint-plugin": "^6.11.0", "eslint-plugin-import": "^2.26.0", "eslint-plugin-promise": "^6.1.1", diff --git a/packages/platform-rig/package.json b/packages/platform-rig/package.json index 8dd5d8266c..eee1202e21 100644 --- a/packages/platform-rig/package.json +++ b/packages/platform-rig/package.json @@ -1,6 +1,6 @@ { "name": "@hcengineering/platform-rig", - "version": "0.7.6", + "version": "0.7.7", "scripts": { "build": "echo 'Not required'", "format": "echo 'Not required'" diff --git a/packages/postgres-base/package.json b/packages/postgres-base/package.json index 962caa82c3..d2eb0d6dbb 100644 --- a/packages/postgres-base/package.json +++ b/packages/postgres-base/package.json @@ -1,6 +1,6 @@ { "name": "@hcengineering/postgres-base", - "version": "0.7.6", + "version": "0.7.7", "main": "lib/index.js", "svelte": "src/index.ts", "types": "types/index.d.ts", @@ -28,7 +28,7 @@ "_phase:validate": "compile validate" }, "devDependencies": { - "@hcengineering/platform-rig": "workspace:^0.7.6", + "@hcengineering/platform-rig": "workspace:^0.7.7", "@typescript-eslint/eslint-plugin": "^6.11.0", "eslint-plugin-import": "^2.26.0", "eslint-plugin-promise": "^6.1.1",