support typeorm >=0.3.0 <1

plugins/node/instrumentation-typeorm/.tav.yml

@@ -1,4 +1,4 @@
 'typeorm':
-  versions: ">0.2.28"
+  versions: ">=0.3.0"
   commands:
     - npm run test

plugins/node/instrumentation-typeorm/README.md

@@ -17,7 +17,7 @@ npm install --save @opentelemetry/instrumentation-typeorm
 
 ### Supported versions
 
-- `>=0.2.29 <1`
+- `>=0.3.0 <1`
 
 ## Usage
 

plugins/node/instrumentation-typeorm/package.json

@@ -31,7 +31,7 @@
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
   "engines": {
-    "node": ">=16.13.0"
+    "node": "^18.19.0 || >=20.6.0"
   },
   "files": [
     "build/src/**/*.js",

plugins/node/instrumentation-typeorm/src/typeorm.ts

@@ -100,11 +100,11 @@
   protected init() {
     const selectQueryBuilder = new InstrumentationNodeModuleFile(
       'typeorm/query-builder/SelectQueryBuilder.js',
-      ['>=0.2.29 <1'],
+      ['>=0.3.0 <1'],
       moduleExports => {
         selectQueryBuilderExecuteMethods.map(method => {
           if (isWrapped(moduleExports.SelectQueryBuilder.prototype?.[method])) {
             this._unwrap(moduleExports.SelectQueryBuilder.prototype, method);
           }
           this._wrap(
             moduleExports.SelectQueryBuilder.prototype,
@@ -125,35 +125,12 @@
       }
     );
 
-    const connection = new InstrumentationNodeModuleFile(
-      'typeorm/connection/Connection.js',
-      ['>0.2.28 <0.3.0'],
-      moduleExports => {
-        if (isWrapped(moduleExports.Connection.prototype?.[rawQueryFuncName])) {
-          this._unwrap(moduleExports.Connection.prototype, rawQueryFuncName);
-        }
-        this._wrap(
-          moduleExports.Connection.prototype,
-          rawQueryFuncName,
-          this._patchRawQuery()
-        );
-
-        return moduleExports;
-      },
-      moduleExports => {
-        if (isWrapped(moduleExports.Connection.prototype?.[rawQueryFuncName])) {
-          this._unwrap(moduleExports.Connection.prototype, rawQueryFuncName);
-        }
-        return moduleExports;
-      }
-    );
-
     const dataSource = new InstrumentationNodeModuleFile(
       'typeorm/data-source/DataSource.js',
       ['>=0.3.0 <1'],
       moduleExports => {
         if (isWrapped(moduleExports.DataSource.prototype?.[rawQueryFuncName])) {
           this._unwrap(moduleExports.DataSource.prototype, rawQueryFuncName);
         }
         this._wrap(
           moduleExports.DataSource.prototype,
@@ -173,11 +150,11 @@
 
     const entityManager = new InstrumentationNodeModuleFile(
       'typeorm/entity-manager/EntityManager.js',
-      ['>=0.2.29 <1'],
+      ['>=0.3.0 <1'],
       moduleExports => {
         entityManagerMethods.map(method => {
           if (isWrapped(moduleExports.EntityManager.prototype?.[method])) {
             this._unwrap(moduleExports.EntityManager.prototype, method);
           }
           this._wrap(
             moduleExports.EntityManager.prototype,
@@ -200,10 +177,10 @@
 
     const module = new InstrumentationNodeModuleDefinition(
       'typeorm',
-      ['>=0.2.29 <1'],
+      ['>=0.3.0 <1'],
       undefined,
       undefined,
-      [selectQueryBuilder, entityManager, connection, dataSource]
+      [selectQueryBuilder, entityManager, dataSource]
     );
     return module;
   }
@@ -214,7 +191,7 @@
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       return function (this: any, ...args: unknown[]) {
         if (isTypeormInternalTracingSuppressed(context.active())) {
           return original.apply(this, args);
         }
         const connectionOptions = this?.connection?.options ?? {};
         const attributes: Record<string, any> = {
@@ -230,7 +207,7 @@
         //ignore EntityMetadataNotFoundError
         try {
           if (this.metadata) {
             attributes[ATTR_DB_SQL_TABLE] = this.metadata.tableName;
           } else {
             const entity = args[0];
             const name =
@@ -261,7 +238,7 @@
 
         const contextWithSuppressTracing = self.getConfig()
           .suppressInternalInstrumentation
           ? suppressTracing(traceContext)
           : traceContext;
 
         return context.with(contextWithSuppressTracing, () =>
@@ -322,7 +299,7 @@
 
         const contextWithSuppressTracing = self.getConfig()
           ?.suppressInternalInstrumentation
           ? suppressTracing(traceContext)
           : traceContext;
 
         return context.with(contextWithSuppressTracing, () =>
@@ -338,7 +315,7 @@
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       return function (this: any, ...args: unknown[]) {
         if (isTypeormInternalTracingSuppressed(context.active())) {
           return original.apply(this, args);
         }
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const sql = args[0] as any;
@@ -363,12 +340,12 @@
         const contextWithSpan = trace.setSpan(context.active(), span);
 
         const traceContext = self.getConfig().enableInternalInstrumentation
           ? contextWithSpan
           : suppressTypeormInternalTracing(contextWithSpan);
 
         const contextWithSuppressTracing = self.getConfig()
           ?.suppressInternalInstrumentation
           ? suppressTracing(traceContext)
           : traceContext;
 
         return context.with(contextWithSuppressTracing, () =>
@@ -401,7 +378,7 @@
           .catch(err => {
             if (err) {
               if (typeof err === 'string') {
                 span.setStatus({ code: SpanStatusCode.ERROR, message: err });
               } else {
                 span.recordException(err);
                 span.setStatus({
@@ -414,15 +391,15 @@
           })
           .finally(() => span.end());
       } else {
         span.end();
         return executeResponseHook(response);
       }
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (error: any) {
       span.recordException(error);
       span.setStatus({ code: SpanStatusCode.ERROR, message: error?.message });
       span.end();
       throw error;
     }
   }
 }
@@ -447,8 +424,8 @@
       statement[pName] = value.name;
       return;
     }
     if (value?.constructor?.name) {
       statement[pName] = value.constructor.name;
     }
   });
   return statement;