whatap 0.5.13 → 0.5.14

package/lib/observers/oracle-observer.js

@@ -475,10 +475,12 @@ OracleObserver.prototype.inject = function (mod, moduleName) {
                 args[callbackIndex] = function wrappedCallback(err, pool) {
                     if (pool) {
                         poolAttributes.set(pool, poolAttrs);
-                        // Wrap Pool's getConnection method after pool is created
-                        shimmer.wrap(pool, 'getConnection', function(originalGetConn) {
-                            return self._wrapPoolGetConnection(originalGetConn, poolAttrs);
-                        });
+                        if (!pool.__whatap_getconn_wrapped) {
+                            pool.__whatap_getconn_wrapped = true;
+                            shimmer.wrap(pool, 'getConnection', function(originalGetConn) {
+                                return self._wrapPoolGetConnection(originalGetConn, poolAttrs);
+                            });
+                        }
                     }
 
                     return originalCallback.apply(this, arguments);
@@ -490,9 +492,12 @@ OracleObserver.prototype.inject = function (mod, moduleName) {
                     .then(function(pool) {
                         if (pool) {
                             poolAttributes.set(pool, poolAttrs);
-                            shimmer.wrap(pool, 'getConnection', function(originalGetConn) {
-                                return self._wrapPoolGetConnection(originalGetConn, poolAttrs);
-                            });
+                            if (!pool.__whatap_getconn_wrapped) {
+                                pool.__whatap_getconn_wrapped = true;
+                                shimmer.wrap(pool, 'getConnection', function(originalGetConn) {
+                                    return self._wrapPoolGetConnection(originalGetConn, poolAttrs);
+                                });
+                            }
                         }
                         return pool;
                     });
@@ -500,17 +505,23 @@ OracleObserver.prototype.inject = function (mod, moduleName) {
         };
     });
 
-    if (mod.Pool && mod.Pool.prototype) {
+    if (mod.Pool && mod.Pool.prototype && !mod.Pool.prototype.__whatap_getconn_wrapped) {
+        mod.Pool.prototype.__whatap_getconn_wrapped = true;
         shimmer.wrap(mod.Pool.prototype, 'getConnection', function(original) {
             return self._wrapPoolGetConnection(original);
         });
     }
 };
 
+// Helper function to wrap a pool's getConnection method
 OracleObserver.prototype._wrapPoolGetConnection = function(originalGetConn, poolAttrs) {
     var self = this;
 
-    return function wrappedGetConnection() {
+    if (originalGetConn.__whatap_wrapped) {
+        return originalGetConn;
+    }
+
+    function wrappedGetConnection() {
         var args = Array.from(arguments);
         var ctx = TraceContextManager.getCurrentContext();
 
@@ -607,6 +618,9 @@ OracleObserver.prototype._wrapPoolGetConnection = function(originalGetConn, pool
                 });
         }
     };
+
+    wrappedGetConnection.__whatap_wrapped = true;
+    return wrappedGetConnection;
 };
 
 var checkedSql = new IntKeyMap(2000).setMax(2000);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "whatap",
   "homepage": "http://www.whatap.io",
-  "version": "0.5.13",
+  "version": "0.5.14",
   "releaseDate": "20250404",
   "description": "Monitoring and Profiling Service",
   "main": "index.js",