diff --git a/packages/service/tsconfig.json b/packages/service/tsconfig.json index 5f31851f1d4e..62df94d8cbd5 100644 --- a/packages/service/tsconfig.json +++ b/packages/service/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "moduleResolution": "bundler" + "moduleResolution": "bundler", }, "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"] } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7ec4ef949e81..b95174ed58d7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -34,8 +34,8 @@ catalogs: specifier: 0.1.2 version: 0.1.2 '@fastgpt-sdk/otel': - specifier: 0.1.0 - version: 0.1.0 + specifier: 0.1.1 + version: 0.1.1 '@fastgpt-sdk/storage': specifier: 0.6.15 version: 0.6.15 @@ -248,7 +248,7 @@ importers: version: 11.7.2 '@fastgpt-sdk/otel': specifier: 'catalog:' - version: 0.1.0 + version: 0.1.1 '@fastgpt-sdk/sandbox-adapter': specifier: ^0.0.31 version: 0.0.31 @@ -2712,8 +2712,8 @@ packages: resolution: {integrity: sha512-nt1qCq7frcRiR+406vEERWC1vEPVIKPUGH/ZRP/mlBxvNJp1RycWQT8RhK7/tHmW6xPNZoRL/q2WfhM4Q+L7eg==} engines: {node: '>=20', pnpm: '>=9'} - '@fastgpt-sdk/otel@0.1.0': - resolution: {integrity: sha512-wpZUcpoU4u1/UxC8R0KU7spZ1Ku2FbGerp4eBeOCgCDaiJGUbm3P7d1D97wzrPIK3QUgWj2g8N6dS0vrlryp2Q==} + '@fastgpt-sdk/otel@0.1.1': + resolution: {integrity: sha512-AUvnQBwy+EzkeAdohs/qhIH3LRArOy912kL/KCZWQQJ7p42GXRuoCIIH6BRXd42M8y1upUJYMZX3Xbm/QDphDg==} engines: {node: '>=20', pnpm: '>=9'} '@fastgpt-sdk/plugin@0.3.8': @@ -13645,7 +13645,7 @@ snapshots: '@opentelemetry/sdk-logs': 0.203.0(@opentelemetry/api@1.9.0) '@opentelemetry/semantic-conventions': 1.39.0 - '@fastgpt-sdk/otel@0.1.0': + '@fastgpt-sdk/otel@0.1.1': dependencies: '@logtape/logtape': 2.0.2 '@logtape/pretty': 2.0.2(@logtape/logtape@2.0.2) diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 9a8aa2b9a55f..6b9c6479bc2b 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -22,7 +22,7 @@ catalog: '@modelcontextprotocol/sdk': ^1 '@fastgpt-sdk/storage': 0.6.15 '@fastgpt-sdk/logger': 0.1.2 - '@fastgpt-sdk/otel': 0.1.0 + '@fastgpt-sdk/otel': 0.1.1 '@types/lodash': ^4 '@types/react': ^18 '@types/react-dom': ^18 diff --git a/projects/app/tsconfig.json b/projects/app/tsconfig.json index c53e9719314a..128f11d72f69 100644 --- a/projects/app/tsconfig.json +++ b/projects/app/tsconfig.json @@ -5,7 +5,6 @@ "paths": { "@/*": ["./src/*"], "@test/*": ["../../test/*"], - "@t3-oss/env-core": ["../../packages/service/node_modules/@t3-oss/env-core/dist/index.d.ts"] } }, "include": [ diff --git a/sdk/otel/package.json b/sdk/otel/package.json index e53b58003b2f..ebcfc54b9f76 100644 --- a/sdk/otel/package.json +++ b/sdk/otel/package.json @@ -1,7 +1,7 @@ { "name": "@fastgpt-sdk/otel", "private": false, - "version": "0.1.0", + "version": "0.1.1", "description": "FastGPT SDK for OpenTelemetry observability", "type": "module", "main": "./dist/index.mjs", diff --git a/sdk/otel/src/logger/client.ts b/sdk/otel/src/logger/client.ts index 07a4b413a19c..5c794fbaadf7 100644 --- a/sdk/otel/src/logger/client.ts +++ b/sdk/otel/src/logger/client.ts @@ -61,47 +61,5 @@ export async function disposeLogger() { } export function getLogger(category: LogCategory = defaultCategory) { - const logger = getLogtapeLogger(category); - - return new Proxy(logger, { - get(target, prop, receiver) { - const fn = Reflect.get(target, prop, receiver); - - if (typeof fn !== 'function') return fn; - - return (...args: unknown[]) => { - if (args.length === 0) return fn.call(target); - - const [firstArg, secondArg] = args; - - if (args.length === 1) { - return fn.call(target, firstArg); - } - - if (typeof firstArg === 'string') { - if ( - typeof secondArg === 'object' && - secondArg && - 'verbose' in secondArg && - typeof secondArg.verbose === 'boolean' && - !secondArg.verbose - ) { - const { verbose: _verbose, ...properties } = secondArg as Record & { - verbose?: boolean; - }; - - return fn.call(target, firstArg, properties); - } - - return fn.call(target, `${firstArg}: {*}`, secondArg); - } - - if (typeof firstArg === 'object') { - return fn.call(target, firstArg); - } - - return fn.apply(target, args); - }; - } - }); + return getLogtapeLogger(category); } diff --git a/sdk/otel/src/logger/sinks.ts b/sdk/otel/src/logger/sinks.ts index 50fd723d3eaa..84c4c9609dba 100644 --- a/sdk/otel/src/logger/sinks.ts +++ b/sdk/otel/src/logger/sinks.ts @@ -1,5 +1,10 @@ import type { LogLevel, LogRecord } from '@logtape/logtape'; -import { getConsoleSink, withFilter } from '@logtape/logtape'; +import { + getConsoleSink, + withFilter, + ansiColorFormatter, + getAnsiColorFormatter +} from '@logtape/logtape'; import { getPrettyFormatter } from '@logtape/pretty'; import { mapLevelToSeverityNumber } from './helpers'; import { getOpenTelemetrySink } from './otel'; @@ -113,7 +118,13 @@ export async function createSinks(options: CreateSinksOptions): Promise levelFilter(record, consoleOptions.level)