move tracing function to tracing package

RocketChat · Dec 10, 2024 · d1c9d1f · d1c9d1f
1 parent 9b8207f
commit d1c9d1f
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 3 deletions.
diff --git a/packages/core-services/src/index.ts b/packages/core-services/src/index.ts
@@ -51,7 +51,6 @@ import type { IVoipFreeSwitchService } from './types/IVoipFreeSwitchService';
 import type { IVoipService } from './types/IVoipService';
 
 export { asyncLocalStorage } from './lib/asyncLocalStorage';
-export { traceInstanceMethods } from './lib/asyncMethodCallContext';
 export { MeteorError, isMeteorError } from './MeteorError';
 export { api } from './api';
 export { EventSignatures } from './events/Events';

diff --git a/packages/models/package.json b/packages/models/package.json
@@ -13,6 +13,7 @@
 	"dependencies": {
 		"@rocket.chat/model-typings": "workspace:~",
 		"@rocket.chat/rest-typings": "workspace:^",
+		"@rocket.chat/tracing": "workspace:^",
 		"node-rsa": "^1.1.1"
 	},
 	"scripts": {

diff --git a/packages/models/src/models/BaseRaw.ts b/packages/models/src/models/BaseRaw.ts
@@ -1,6 +1,6 @@
-import { traceInstanceMethods } from '@rocket.chat/core-services';
 import type { RocketChatRecordDeleted } from '@rocket.chat/core-typings';
 import type { IBaseModel, DefaultFields, ResultFields, FindPaginated, InsertionModel } from '@rocket.chat/model-typings';
+import { traceInstanceMethods } from '@rocket.chat/tracing';
 import { ObjectId } from 'mongodb';
 import type {
 	BulkWriteOptions,

diff --git a/packages/tracing/src/index.ts b/packages/tracing/src/index.ts
@@ -9,6 +9,8 @@ import { initDatabaseTracing } from './traceDatabaseCalls';
 
 let tracer: Tracer | undefined;
 
+export * from './traceInstanceMethods';
+
 export function isTracingEnabled() {
 	return ['yes', 'true'].includes(String(process.env.TRACING_ENABLED).toLowerCase());
 }

diff --git a/...ervices/src/lib/asyncMethodCallContext.ts → packages/tracing/src/traceInstanceMethods.ts b/...ervices/src/lib/asyncMethodCallContext.ts → packages/tracing/src/traceInstanceMethods.ts
@@ -1,4 +1,4 @@
-import { tracerActiveSpan } from '@rocket.chat/tracing';
+import { tracerActiveSpan } from '.';
 
 const getArguments = (args: any[]): any[] => {
 	return args.map((arg) => {

diff --git a/yarn.lock b/yarn.lock
@@ -9558,6 +9558,7 @@ __metadata:
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/model-typings": "workspace:~"
     "@rocket.chat/rest-typings": "workspace:^"
+    "@rocket.chat/tracing": "workspace:^"
     "@types/jest": "npm:~29.5.14"
     "@types/node-rsa": "npm:^1.1.4"
     eslint: "npm:~8.45.0"