whatap 0.4.66 → 0.4.68

package/lib/core/agent.js

@@ -108,7 +108,7 @@ NodeAgent.prototype.init = function(cb) {
     self.findRoot();
     
     Logger.initializer.process();
-    Logger.print('WHATAP-001', 'Start initialize WhaTap Agent...', true);
+    Logger.print('WHATAP-001', 'Start initialize WhaTap Agent... Root[' + self._conf['app.root'] + ']', true);
 
     if(self._conf['app.root'] == null || self._conf['app.root'].length == 0) {
         return Logger.print("WHATAP-001", "Can not find application root directory", true);

package/lib/observers/mysql-observer.js

@@ -279,8 +279,7 @@ MysqlObserver.prototype.inject = function (mod, moduleName) {
 
      
  var dbc_pool_hash=0;
- aop.after(mod, ['createPool', 'createPoolCluster'], function (obj, args, ret) {
-
+ aop.after(mod, ['createPool'], function (obj, args, ret) {
      var dbc = 'mysql://';
      if(dbc_pool_hash==0){
          if(args.length > 0) {
@@ -322,10 +321,11 @@ MysqlObserver.prototype.inject = function (mod, moduleName) {
              aop.before(conn._protocol, '_delegateError', errorDelegate(ctx));
          });
      }, function (obj, args, ret, lctx) {
-
-         var all = obj._allConnections.length,
-             idle = obj._freeConnections.length;
-         MeterSql.setConnection((all - idle), idle, dbc);
+        if(obj._allConnections != undefined) {
+            var all = obj._allConnections.length;
+            var idle = obj._freeConnections.length;
+            MeterSql.setConnection((all - idle), idle, dbc);
+        }
      });
  });
 };

package/lib/util/kube-util.js

@@ -17,8 +17,18 @@ var KubeUtil = {
             for(var i = 0 ; i < contents.length ; i++){
                 var line = contents[i];
                 if(line){
-                    this.container_id = line.substr(line.lastIndexOf('/')+1) || '';
-                    this.container_id = this.container_id.replace(/^(docker-)+|(containerd-)+|(crio-)+|(\\.scope)+$/ig, "");
+                    if(line.indexOf("/ecs/") >= 0) {
+                        this.container_id = line.substr(line.lastIndexOf('/')+1) || '';
+                      } else{
+                        //this.container_id = line.substr(line.lastIndexOf('/')+1) || '';
+                        //this.container_id = this.container_id.replace(/^(docker-)+|(cri-containerd-)+|(crio-)+|(\\.scope)+$/ig, "");
+                        //container_id = container_id.replace(/^(docker-)+|(cri-)+|(cri-containerd-)+|(crio-)+|(.scope)+$/ig, "");
+                        this.container_id = line.substr(line.lastIndexOf('/')+1) || '';
+                        this.container_id = this.container_id.replace(/^|(.scope)+$/ig, "");
+                        this.container_id = this.container_id.substr(this.container_id.lastIndexOf('-')+1);
+                        this.container_id = this.container_id.substr(this.container_id.lastIndexOf(':')+1);
+                      }
+
                     if(this.container_id.length > 5){
                         this.container_key = HashUtil2.hash(this.container_id);
                         break;

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "whatap",
   "homepage": "http://www.whatap.io",
-  "version": "0.4.66",
-  "releaseDate": "20230104",
+  "version": "0.4.68",
+  "releaseDate": "20230315",
   "description": "Monitoring and Profiling Service",
   "main": "index.js",
   "scripts": {},
@@ -14,13 +14,13 @@
     "node": ">=v4.*"
   },
   "dependencies": {
-    "crypto": "0.0.3",
+    "crypto": "^1.0.1",
     "df": "^1.1.1",
     "long": "^3.2.0",
     "pidusage": "^1.1.0"
   },
   "devDependencies": {
-    "crypto": "0.0.3",
+    "crypto": "^1.0.1",
     "df": "^1.1.1",
     "long": "^3.2.0",
     "pidusage": "^1.1.0"