support typeorm >=0.3.0 <1

Author: seemk

package-lock.json

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

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

@@ -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/README.md

@@ -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/package.json

@@ -100,7 +100,7 @@ export class TypeormInstrumentation extends InstrumentationBase<TypeormInstrumen
   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])) {
@@ -125,29 +125,6 @@ export class TypeormInstrumentation extends InstrumentationBase<TypeormInstrumen
       }
     );
 
-    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'],
@@ -173,7 +150,7 @@ export class TypeormInstrumentation extends InstrumentationBase<TypeormInstrumen
 
     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])) {
@@ -200,10 +177,10 @@ export class TypeormInstrumentation extends InstrumentationBase<TypeormInstrumen
 
     const module = new InstrumentationNodeModuleDefinition(
       'typeorm',
-      ['>=0.2.29 <1'],
+      ['>=0.3.0 <1'],
       undefined,
       undefined,
-      [selectQueryBuilder, entityManager, connection, dataSource]
+      [selectQueryBuilder, entityManager, dataSource]
     );
     return module;
   }