whatap 0.4.79 → 0.4.80

package/lib/util/keygen.js

@@ -1,18 +1,18 @@
-/**
- * Copyright 2016 the WHATAP project authors. All rights reserved.
- * Use of this source code is governed by a license that
- * can be found in the LICENSE file.
- */
-
-require('./seedrandom');
-
-var Long    = require('long'),
-    rand    = new Math.seedrandom(Date.now(), {entropy : true});
-
-var KeyGen = {
-    next : function () {
-        return Long.fromBits(rand.int32(), rand.int32());
-    }
-};
-
+/**
+ * Copyright 2016 the WHATAP project authors. All rights reserved.
+ * Use of this source code is governed by a license that
+ * can be found in the LICENSE file.
+ */
+
+require('./seedrandom');
+
+var Long    = require('long'),
+    rand    = new Math.seedrandom(Date.now(), {entropy : true});
+
+var KeyGen = {
+    next : function () {
+        return Long.fromBits(rand.int32(), rand.int32());
+    }
+};
+
 module.exports = KeyGen;

package/lib/util/kube-util.js

@@ -1,73 +1,73 @@
-var fs = require('fs');
-var HashUtil2    = require('./hashutil2'),
-    StringUtil  = require('./string-util'),
-    Logger      = require('./../logger');
-
-var KubeUtil = {
-    container_key: 0, 
-    container_id: undefined,
-    loadFromMountinfo: function() {
-        if (this.container_id !== null && this.container_id !== undefined) return;
-
-        try{
-            var content = fs.readFileSync("/proc/self/mountinfo");
-            content = content.toString('utf-8');
-            var contents = content.split('\n')
-
-            for(var i = 0 ; i < contents.length ; i++){
-                var line = contents[i].trim();
-                if(line){
-                    if(line.indexOf("/kubelet/pods/") >= 0) {
-                        let lineParts = line.split("/kubelet/pods/");
-                        if (lineParts != null && lineParts.length > 1) {
-                            this.container_id= lineParts[1].split('/')[0];
-                        }
-                        if(this.container_id.length > 5){
-                            this.container_key = HashUtil2.hash(this.container_id);
-                            break;
-                        }
-                    }
-                }
-            }
-            Logger.print('WHATAP-800' , 'loadFromMountinfo id:' + this.container_id + ' // key:' + this.container_key  , false)
-        }catch(e){
-            Logger.printError('WHATAP-800', 'KubeUtil(loadFromMountinfo) ', e)
-        }
-    },
-    loadContainerId: function(){
-        if (this.container_id !== null && this.container_id !== undefined) return;
-
-        try{
-            var content = fs.readFileSync("/proc/self/cgroup");
-            content = content.toString('utf-8');
-            var contents = content.split('\n')
-
-            for(var i = 0 ; i < contents.length ; i++){
-                var line = contents[i].trim();
-                if(line){
-                    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;
-                    }
-                }
-            }
-            Logger.print('WHATAP-800' , 'loadContainerId id:' + this.container_id + ' // key:' + this.container_key  , false);
-        }catch(e){
-            Logger.printError('WHATAP-800', 'KubeUtil(loadContainerId) ', e)
-        }
-        if(this.container_key == 0) this.loadFromMountinfo();
-    }
-}
+var fs = require('fs');
+var HashUtil2    = require('./hashutil2'),
+    StringUtil  = require('./string-util'),
+    Logger      = require('./../logger');
+
+var KubeUtil = {
+    container_key: 0, 
+    container_id: undefined,
+    loadFromMountinfo: function() {
+        if (this.container_id !== null && this.container_id !== undefined) return;
+
+        try{
+            var content = fs.readFileSync("/proc/self/mountinfo");
+            content = content.toString('utf-8');
+            var contents = content.split('\n')
+
+            for(var i = 0 ; i < contents.length ; i++){
+                var line = contents[i].trim();
+                if(line){
+                    if(line.indexOf("/kubelet/pods/") >= 0) {
+                        let lineParts = line.split("/kubelet/pods/");
+                        if (lineParts != null && lineParts.length > 1) {
+                            this.container_id= lineParts[1].split('/')[0];
+                        }
+                        if(this.container_id.length > 5){
+                            this.container_key = HashUtil2.hash(this.container_id);
+                            break;
+                        }
+                    }
+                }
+            }
+            Logger.print('WHATAP-800' , 'loadFromMountinfo id:' + this.container_id + ' // key:' + this.container_key  , false)
+        }catch(e){
+            Logger.printError('WHATAP-800', 'KubeUtil(loadFromMountinfo) ', e)
+        }
+    },
+    loadContainerId: function(){
+        if (this.container_id !== null && this.container_id !== undefined) return;
+
+        try{
+            var content = fs.readFileSync("/proc/self/cgroup");
+            content = content.toString('utf-8');
+            var contents = content.split('\n')
+
+            for(var i = 0 ; i < contents.length ; i++){
+                var line = contents[i].trim();
+                if(line){
+                    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;
+                    }
+                }
+            }
+            Logger.print('WHATAP-800' , 'loadContainerId id:' + this.container_id + ' // key:' + this.container_key  , false);
+        }catch(e){
+            Logger.printError('WHATAP-800', 'KubeUtil(loadContainerId) ', e)
+        }
+        if(this.container_key == 0) this.loadFromMountinfo();
+    }
+}
 module.exports = KubeUtil;

package/lib/util/longint-linkedmap.js

@@ -1,36 +1,36 @@
-/**
- * Copyright 2016 the WHATAP project authors. All rights reserved.
- * Use of this source code is governed by a license that
- * can be found in the LICENSE file.
- */
-
-
-//var LongKeyLinkedMap   = require('./longkey-linkedmap');
-var LinkedMap   = require('./linkedmap'),
-    Long        = require('long');
-
-
-function LongIntLinkedMap(initCapacity, loadFactor) {
-    LinkedMap.call(this, initCapacity, loadFactor);
-    return this;
-}
-LongIntLinkedMap.prototype = new LinkedMap();
-LongIntLinkedMap.prototype.constructor = LongIntLinkedMap;
-// LongIntLinkedMap.prototype.add = function (key, value) {
-//     var val = LongKeyLinkedMap.prototype.get.call(this, key)
-//     LongKeyLinkedMap.prototype.put.call(val.add(value));
-// };
-LongIntLinkedMap.prototype.none = function () {
-    return 0;
-};
-LongIntLinkedMap.prototype.hash = function (key /*long*/) {
-    return Math.abs(key.toNumber());
-};
-LongIntLinkedMap.prototype.equals = function (key1, key2) {
-    return key1.equals(key2);
-};
-LongIntLinkedMap.prototype.sum = function (value1, value2) {
-    return value1+value2;
-};
-
+/**
+ * Copyright 2016 the WHATAP project authors. All rights reserved.
+ * Use of this source code is governed by a license that
+ * can be found in the LICENSE file.
+ */
+
+
+//var LongKeyLinkedMap   = require('./longkey-linkedmap');
+var LinkedMap   = require('./linkedmap'),
+    Long        = require('long');
+
+
+function LongIntLinkedMap(initCapacity, loadFactor) {
+    LinkedMap.call(this, initCapacity, loadFactor);
+    return this;
+}
+LongIntLinkedMap.prototype = new LinkedMap();
+LongIntLinkedMap.prototype.constructor = LongIntLinkedMap;
+// LongIntLinkedMap.prototype.add = function (key, value) {
+//     var val = LongKeyLinkedMap.prototype.get.call(this, key)
+//     LongKeyLinkedMap.prototype.put.call(val.add(value));
+// };
+LongIntLinkedMap.prototype.none = function () {
+    return 0;
+};
+LongIntLinkedMap.prototype.hash = function (key /*long*/) {
+    return Math.abs(key.toNumber());
+};
+LongIntLinkedMap.prototype.equals = function (key1, key2) {
+    return key1.equals(key2);
+};
+LongIntLinkedMap.prototype.sum = function (value1, value2) {
+    return value1+value2;
+};
+
 module.exports = LongIntLinkedMap;

package/lib/util/longkey-linkedmap.js

@@ -1,26 +1,26 @@
-/**
- * Copyright 2016 the WHATAP project authors. All rights reserved.
- * Use of this source code is governed by a license that
- * can be found in the LICENSE file.
- */
-
-
-var LinkedMap   = require('./linkedmap'),
-    Long        = require('long');
-
-function LongKeyLinkedMap(initCapacity, loadFactor){
-    LinkedMap.call(this, initCapacity, loadFactor);
-    return this;
-}
-
-LongKeyLinkedMap.prototype = new LinkedMap();
-LongKeyLinkedMap.prototype.constructor = LongKeyLinkedMap;
-
-LongKeyLinkedMap.prototype.hash = function (key /*long*/) {
-    return Math.abs(key.toNumber());
-};
-LongKeyLinkedMap.prototype.equals = function (key1, key2) {
-    return key1.equals(key2);
-};
-
+/**
+ * Copyright 2016 the WHATAP project authors. All rights reserved.
+ * Use of this source code is governed by a license that
+ * can be found in the LICENSE file.
+ */
+
+
+var LinkedMap   = require('./linkedmap'),
+    Long        = require('long');
+
+function LongKeyLinkedMap(initCapacity, loadFactor){
+    LinkedMap.call(this, initCapacity, loadFactor);
+    return this;
+}
+
+LongKeyLinkedMap.prototype = new LinkedMap();
+LongKeyLinkedMap.prototype.constructor = LongKeyLinkedMap;
+
+LongKeyLinkedMap.prototype.hash = function (key /*long*/) {
+    return Math.abs(key.toNumber());
+};
+LongKeyLinkedMap.prototype.equals = function (key1, key2) {
+    return key1.equals(key2);
+};
+
 module.exports = LongKeyLinkedMap;

package/lib/util/longlong-linkedmap.js

@@ -1,38 +1,38 @@
-/**
- * Copyright 2016 the WHATAP project authors. All rights reserved.
- * Use of this source code is governed by a license that
- * can be found in the LICENSE file.
- */
-
-var LinkedMap   = require('./linkedmap'),
-    Long        = require('long');
-
-
-function LongLongLinkedMap(initCapacity, loadFactor) {
-    LinkedMap.call(this, initCapacity, loadFactor);
-    return this;
-}
-function LongLongLinkedMap(initCapacity, loadFactor) {
-    LongKeyLinkedMap.call(this, initCapacity, loadFactor);
-    return this;
-}
-LongLongLinkedMap.prototype = new LinkedMap();
-LongLongLinkedMap.prototype.constructor = LongLongLinkedMap;
-
-LongLongLinkedMap.prototype.none = function () {
-    return 0;
-};
-LongLongLinkedMap.prototype.hash = function (key /*long*/) {
-    return Math.abs(key.toNumber());
-};
-LongLongLinkedMap.prototype.equals = function (key1, key2) {
-    if(key1===key2){
-        return true;
-    }
-    return key1.equals(key2);
-};
-LongLongLinkedMap.prototype.sum = function (value1, value2) {
-    return value1.add(value2);
-};
-
+/**
+ * Copyright 2016 the WHATAP project authors. All rights reserved.
+ * Use of this source code is governed by a license that
+ * can be found in the LICENSE file.
+ */
+
+var LinkedMap   = require('./linkedmap'),
+    Long        = require('long');
+
+
+function LongLongLinkedMap(initCapacity, loadFactor) {
+    LinkedMap.call(this, initCapacity, loadFactor);
+    return this;
+}
+function LongLongLinkedMap(initCapacity, loadFactor) {
+    LongKeyLinkedMap.call(this, initCapacity, loadFactor);
+    return this;
+}
+LongLongLinkedMap.prototype = new LinkedMap();
+LongLongLinkedMap.prototype.constructor = LongLongLinkedMap;
+
+LongLongLinkedMap.prototype.none = function () {
+    return 0;
+};
+LongLongLinkedMap.prototype.hash = function (key /*long*/) {
+    return Math.abs(key.toNumber());
+};
+LongLongLinkedMap.prototype.equals = function (key1, key2) {
+    if(key1===key2){
+        return true;
+    }
+    return key1.equals(key2);
+};
+LongLongLinkedMap.prototype.sum = function (value1, value2) {
+    return value1.add(value2);
+};
+
 module.exports = LongLongLinkedMap;

package/lib/util/nodeutil.js

@@ -1,68 +1,68 @@
-/**
- * Copyright 2016 the WHATAP project authors. All rights reserved.
- * Use of this source code is governed by a license that
- * can be found in the LICENSE file.
- */
-
-var fs      = require('fs'),
-    path    = require('path');
-
-function getPackageJson(){
-    var appDir = require('./../conf/configure')['app.root'];
-    try {
-        var whatap_path = path.join(
-            appDir,
-            'node_modules',
-            'whatap',
-            'package.json');
-        NodeUtil.packageJson = require(whatap_path, 'utf8');
-        return;
-    } catch(e) {
-    }
-    NodeUtil.packageJson = {};
-}
-function recursiveCall(fullPath, file, cb){
-    if(fullPath === undefined) return;
-
-    if(fullPath && fullPath.length < 3 ) {
-        if(cb) return cb('root');
-    }
-
-    fs.access( path.join( fullPath, file) , function(err,data){
-        if(err && err.code == "ENOENT"){
-            return recursiveCall( path.resolve(fullPath , '..') , file, cb);
-        }else if(err){
-            return cb( err );
-        }else{
-            return cb(null, path.join( fullPath, file ) );
-        }
-    });
-}
-
-var NodeUtil = {
-    getVersion: function(){
-        return this.packageJson['version'] || 'unknown';
-    },
-    getName: function(){
-        return this.packageJson['name'] || 'WhaTap APM';
-    },
-    getTimeZone: function(){
-        var d = new Date();
-        //var dateString = d.toString();
-        var dateString = d.getTimezoneOffset();
-
-        if(dateString < 0) dateString = "GMT+" + ((100 + Math.abs(dateString/60)) + '00').substr(1);
-        else if(dateString > 0) dateString = "GMT-" + ((100 + Math.abs(dateString/60)) + '00').substr(1);
-        else dateString = "GMT";
-        //return /GMT[!\S]*/.exec(dateString)[0];
-        return dateString;
-    },
-    getReleaseDate: function(){
-        return this.packageJson['releaseDate'] || 'unknown';
-    },
-    recursiveCall: recursiveCall,
-    getPackageJson : getPackageJson,
-    packageJson : {}
-};
-
+/**
+ * Copyright 2016 the WHATAP project authors. All rights reserved.
+ * Use of this source code is governed by a license that
+ * can be found in the LICENSE file.
+ */
+
+var fs      = require('fs'),
+    path    = require('path');
+
+function getPackageJson(){
+    var appDir = require('./../conf/configure')['app.root'];
+    try {
+        var whatap_path = path.join(
+            appDir,
+            'node_modules',
+            'whatap',
+            'package.json');
+        NodeUtil.packageJson = require(whatap_path, 'utf8');
+        return;
+    } catch(e) {
+    }
+    NodeUtil.packageJson = {};
+}
+function recursiveCall(fullPath, file, cb){
+    if(fullPath === undefined) return;
+
+    if(fullPath && fullPath.length < 3 ) {
+        if(cb) return cb('root');
+    }
+
+    fs.access( path.join( fullPath, file) , function(err,data){
+        if(err && err.code == "ENOENT"){
+            return recursiveCall( path.resolve(fullPath , '..') , file, cb);
+        }else if(err){
+            return cb( err );
+        }else{
+            return cb(null, path.join( fullPath, file ) );
+        }
+    });
+}
+
+var NodeUtil = {
+    getVersion: function(){
+        return this.packageJson['version'] || 'unknown';
+    },
+    getName: function(){
+        return this.packageJson['name'] || 'WhaTap APM';
+    },
+    getTimeZone: function(){
+        var d = new Date();
+        //var dateString = d.toString();
+        var dateString = d.getTimezoneOffset();
+
+        if(dateString < 0) dateString = "GMT+" + ((100 + Math.abs(dateString/60)) + '00').substr(1);
+        else if(dateString > 0) dateString = "GMT-" + ((100 + Math.abs(dateString/60)) + '00').substr(1);
+        else dateString = "GMT";
+        //return /GMT[!\S]*/.exec(dateString)[0];
+        return dateString;
+    },
+    getReleaseDate: function(){
+        return this.packageJson['releaseDate'] || 'unknown';
+    },
+    recursiveCall: recursiveCall,
+    getPackageJson : getPackageJson,
+    packageJson : {}
+};
+
 module.exports = NodeUtil;