whatap 0.4.49 → 0.4.52

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Binary file
@@ -190,7 +190,34 @@ var ConfigDefault = {
190
190
  "mtid_mtrace_enabled": bool('mtid_mtrace_enabled' , false),
191
191
 
192
192
  // debug add
193
- "network_debug_enabled" : bool('network_debug_enabled', false)
193
+ "network_debug_enabled" : bool('network_debug_enabled', false),
194
+ // reqlog add
195
+ "reqlog_rotation_enabled": true,
196
+ "reqlog_keep_days": 7,
197
+ "reqlog_enabled": false,
198
+ "reqlog_seperator" : str('reqlog_seperator', '|'),
199
+
200
+ "reqlog_x_etime" : bool('reqlog_x_etime', true),
201
+ "reqlog_x_elapsed" : bool('reqlog_x_elapsed', true),
202
+ "reqlog_x_url" : bool('reqlog_x_url', true),
203
+ "reqlog_x_httphost" : bool('reqlog_x_httphost', true),
204
+ "reqlog_x_method" : bool('reqlog_x_method', true),
205
+ "reqlog_x_ip" : bool('reqlog_x_ip', true),
206
+ "reqlog_x_wcid" : bool('reqlog_x_wcid', true),
207
+ "reqlog_x_status" : bool('reqlog_x_status', true),
208
+ "reqlog_x_error" : bool('reqlog_x_error', true),
209
+ "reqlog_x_errormsg" : bool('reqlog_x_errormsg', true),
210
+ "reqlog_x_useragent" : bool('reqlog_x_useragent', true),
211
+ "reqlog_x_txid" : bool('reqlog_x_txid', true),
212
+ "reqlog_x_custid" : bool('reqlog_x_custid', false),
213
+ "reqlog_x_gtid" : bool('reqlog_x_gtid', true),
214
+ "reqlog_x_mtid" : bool('reqlog_x_mtid', true),
215
+ "reqlog_x_mdepth" : bool('reqlog_x_mdepth', true),
216
+ "reqlog_x_httpc" : bool('reqlog_x_httpc', true),
217
+ "reqlog_x_sql" : bool('reqlog_x_sql', true),
218
+ "reqlog_x_dbc" : bool('reqlog_x_dbc', true),
219
+ "reqlog_x_login" : bool('reqlog_x_login', true),
220
+ "reqlog_x_rs" : bool('reqlog_x_rs', true),
194
221
  };
195
222
 
196
223
  ConfigDefault._hook_method_ignore_prefix = ConfigDefault.hook_method_ignore_prefixes.split(',');
package/lib/core/agent.js CHANGED
@@ -7,7 +7,7 @@
7
7
  var os = require('os'),
8
8
  fs = require('fs'),
9
9
  path = require('path');
10
-
10
+
11
11
  var Interceptor = require('./interceptor').Interceptor,
12
12
  HttpObserver = require('../observers/http-observer').HttpObserver,
13
13
  NetObserver = require('../observers/net-observer').NetObserver,
@@ -104,8 +104,8 @@ NodeAgent.prototype.init = function(cb) {
104
104
  self.starttime = Date.now();
105
105
 
106
106
  self.findRoot();
107
+
107
108
  Logger.initializer.process();
108
-
109
109
  Logger.print('WHATAP-001', 'Start initialize WhaTap Agent...', true);
110
110
 
111
111
  if(self._conf['app.root'] == null || self._conf['app.root'].length == 0) {
@@ -122,6 +122,7 @@ NodeAgent.prototype.init = function(cb) {
122
122
  return;
123
123
  }
124
124
  Logger.print('WHATAP-101', 'Finish initialize configuration...', false);
125
+
125
126
  self._securityMaster.run( function (err) {
126
127
  if(err) {
127
128
  Logger.printError('WHATAP-104', 'Failed to connect to whatap server', err, false);
package/lib/logger.js CHANGED
@@ -3,305 +3,305 @@
3
3
  * Use of this source code is governed by a license that
4
4
  * can be found in the LICENSE file.
5
5
  */
6
- var WHATAP_CONF = process.env.WHATAP_CONF || 'whatap';
6
+ var WHATAP_CONF = process.env.WHATAP_CONF || 'whatap';
7
7
 
8
- var conf = require('./conf/configure'),
9
- DateUtil = require('./util/dateutil'),
10
- path = require('path'),
11
- fs = require('fs');
12
-
13
- var PID=process.pid;
14
-
15
- var initializer = {
16
- last : DateUtil.currentTime(),
17
- lastDateUnit : DateUtil.getDateUnit(),
18
- lastFileRotation : conf.log_rotation_enabled,
19
- reset : function () {
20
- if(Logger.printWriter)
21
- Logger.printWriter.close();
22
- Logger.logfile = null;
23
- Logger.openFile();
24
- },
25
- process : function () {
26
- conf = require('./conf/configure');
27
- var now = DateUtil.currentTime();
28
- if(now > this.last + DateUtil.MILLIS_PER_HOUR) {
29
- this.last = now;
30
- Logger.clearOldLog();
31
- }
32
- if(this.lastFileRotation !== conf.log_rotation_enabled
33
- || this.lastDateUnit !== DateUtil.getDateUnit()
34
- || (Logger.logfile !== null && fs.existsSync(Logger.logfile) == false)) {
35
- try {
36
- if(Logger.printWriter){
37
- Logger.printWriter.close();
38
- }
39
- Logger.logfile = null;
40
- this.lastFileRotation = conf.log_rotation_enabled;
41
- this.lastDateUnit = DateUtil.getDateUnit();
42
- } catch(e) {
43
- console.log(e);
44
- }
45
- }
46
- try {
47
- Logger.openFile();
48
- } catch(e) {
49
- console.log(e);
50
- }
51
- }
52
- };
53
-
54
- var Logger = {
55
- ONAME : null,
56
- logfile : null,
57
- lastLog : {},
58
- printWriter : null,
59
- printAll : function (id, message, sysout) {
60
- try{
61
- var b_msg = this.build(id, message);
62
- if(this.printWriter != null) {
63
- this.printWriter.write(b_msg);
64
- this.printWriter.write('\n');
65
- } else {
66
- this.openFile();
67
- }
68
- sysout = (sysout || process.env.WHATAP_PRINT);
69
- if(sysout) {
70
- console.log(b_msg);
71
- }
72
- } catch (e){
73
- if(sysout) {
74
- console.log(e);
75
- }
76
- }
77
- },
78
- print : function (id, message, sysout) {
79
- if(this.checkOk(id, 10) == false) {
80
- return;
81
- }
82
- try{
83
- var b_msg = this.build(id, message);
84
- if(this.printWriter != null) {
85
- this.printWriter.write(b_msg);
86
- this.printWriter.write('\n');
87
- } else {
88
- this.openFile();
89
- }
90
- sysout = (sysout || process.env.WHATAP_PRINT);
91
- if(sysout) {
92
- console.log(b_msg);
93
- }
94
- } catch (e){
95
- if(sysout) {
96
- console.log(e);
97
- }
98
- }
99
- },
100
- printError : function (id, message, err, sysout) {
101
- if(this.checkOk(id, 10) == false) {
102
- return;
103
- }
104
- this.print(id, message, false);
105
- sysout = (sysout || process.env.WHATAP_PRINT);
106
- if(sysout) {
107
- console.error(this.build(id, message));
108
- }
109
- if(err) {
110
- if(this.printWriter != null) {
111
- this.printWriter.write(err.stack);
112
- this.printWriter.write('\n');
113
- }
114
- }
115
- },
116
- checkOk : function (id, sec) {
117
- if(conf.log_print_enabled === false) { return false; }
118
- if(conf.isIgnoreLog && conf.isIgnoreLog(id)) { return false; }
119
-
120
- if(Object.keys(Logger.lastLog).length >= 1000) {
121
- Logger.lastLog = {};
122
- }
123
-
124
- if(sec > 0) {
125
- var last = Logger.lastLog[id];
126
- if(last == null) {
127
- last = 0;
128
- }
129
- var now = Date.now();
130
- if(now < last + sec * 1000) {
131
- return false;
132
- }
133
- Logger.lastLog[id] = now;
134
- }
135
- return true;
136
- },
137
- build : function (id, message) {
138
- var str = DateUtil.datetime(Date.now());
139
- str += ' [';
140
- str += id;
141
- str += '] <' + PID + '> ';
142
- str += message;
143
- return str;
144
- },
145
- openFile : function () {
146
- if(conf.log_file_enabled === false ) { return; }
147
- var log_prefix = WHATAP_CONF+"-";
148
-
149
- var root = conf['app.root'];
150
- if(root==null || root ==undefined){
151
- console.log('[WHATAP]Logger Error - WHATAP ROOT DIR IS NULL!!!!!!!!!');
152
- return;
153
- }
154
- var dir = path.join(root, 'logs');
155
- if(fs.existsSync(dir) == false) {
156
- fs.mkdirSync(dir);
157
- }
158
-
159
- if(conf.log_rotation_enabled) {
160
- var file = path.join(dir, log_prefix + DateUtil.yyyymmdd() + '.log');
161
- this.logfile = file;
162
- this.printWriter = fs.createWriteStream(file, {flags : 'a'});
163
- } else {
164
- var file = path.join(dir, 'whatap.log');
165
- this.logfile = file;
166
- this.printWriter = fs.createWriteStream(file, {flags : 'a'});
167
- }
168
-
169
- },
170
- clearOldLog : function () {
171
- if(conf.log_rotation_enabled === false || conf.log_enabled === false) { return; }
172
- if(conf.log_keep_days <= 0) { return; }
173
-
174
- var nowUnit = DateUtil.getDateUnit(),
175
- root = conf['app.root'],
176
- dir = path.join(root, 'logs'),
177
- log_prefix = WHATAP_CONF+"-";
178
-
179
- fs.readdir(dir, function (err, files) {
180
-
181
- for(var i=0; i<files.length; i++) {
182
- var stat = fs.statSync(path.join(dir, files[i]));
183
- if(stat.isDirectory()) {
184
- return true;
185
- }
186
- var name = files[i];
187
- if(name.indexOf(log_prefix) < 0) {
188
- return true;
189
- }
190
- var x = name.lastIndexOf('.');
191
- if(x < 0) {
192
- return true;
193
- }
194
- var date = name.substr(log_prefix.length + 1, (x - log_prefix.length - 1));
195
- if(date.length != 8) {
196
- return true;
197
- }
198
- var d = DateUtil.yyyymmdd(date);
199
- var fileUnit = DateUtil.getDateUnit(d);
200
- try {
201
- if (nowUnit - fileUnit > conflog_keep_days) {
202
- fs.unlinkSync(path.join(dir, files[i]));
203
- }
204
- } catch (e) { }
205
- }
206
-
207
- });
208
- },
209
- read : function( file, endpos, length , callback) {
210
-
211
- if ( file == null || length === 0)
212
- return null;
213
- if (file.startsWith(WHATAP_CONF) == false)
214
- return null;
215
-
216
-
217
-
218
- var root = conf['app.root'];
219
- if(root==null ){
220
- return null;
221
- }
222
- var dir = path.join(root, 'logs');
223
- var fileFullPath = path.join(dir, file);
224
-
225
- if(fs.existsSync(fileFullPath) == false) {
226
- return null;
227
- }
228
- const stats = fs.statSync(fileFullPath);
229
-
230
- if (endpos < 0) {
231
- endpos = stats.size;
232
- }
8
+ var conf = require('./conf/configure'),
9
+ DateUtil = require('./util/dateutil'),
10
+ path = require('path'),
11
+ fs = require('fs');
12
+
13
+ var PID=process.pid;
14
+
15
+ var initializer = {
16
+ last : DateUtil.currentTime(),
17
+ lastDateUnit : DateUtil.getDateUnit(),
18
+ lastFileRotation : true,
19
+ reset : function () {
20
+ if(Logger.printWriter)
21
+ Logger.printWriter.close();
22
+ Logger.logfile = null;
23
+ Logger.openFile();
24
+ },
25
+ process : function () {
26
+ conf = require('./conf/configure');
27
+ var now = DateUtil.currentTime();
28
+ if(now > this.last + DateUtil.MILLIS_PER_HOUR) {
29
+ this.last = now;
30
+ Logger.clearOldLog();
31
+ }
32
+ if(this.lastFileRotation !== conf.log_rotation_enabled
33
+ || this.lastDateUnit !== DateUtil.getDateUnit()
34
+ || (Logger.logfile !== null && fs.existsSync(Logger.logfile) == false)) {
35
+ try {
36
+ if(Logger.printWriter){
37
+ Logger.printWriter.close();
38
+ }
39
+ Logger.logfile = null;
40
+ this.lastFileRotation = conf.log_rotation_enabled;
41
+ this.lastDateUnit = DateUtil.getDateUnit();
42
+ } catch(e) {
43
+ console.log(e);
44
+ }
45
+ }
46
+ try {
47
+ Logger.openFile();
48
+ } catch(e) {
49
+ console.log(e);
50
+ }
51
+ }
52
+ };
53
+
54
+ var Logger = {
55
+ ONAME : null,
56
+ logfile : null,
57
+ lastLog : {},
58
+ printWriter : null,
59
+ printAll : function (id, message, sysout) {
60
+ try{
61
+ var b_msg = this.build(id, message);
62
+ if(this.printWriter != null) {
63
+ this.printWriter.write(b_msg);
64
+ this.printWriter.write('\n');
65
+ } else {
66
+ this.openFile();
67
+ }
68
+ sysout = (sysout || process.env.WHATAP_PRINT);
69
+ if(sysout) {
70
+ console.log(b_msg);
71
+ }
72
+ } catch (e){
73
+ if(sysout) {
74
+ console.log(e);
75
+ }
76
+ }
77
+ },
78
+ print : function (id, message, sysout) {
79
+ if(this.checkOk(id, 10) == false) {
80
+ return;
81
+ }
82
+ try{
83
+ var b_msg = this.build(id, message);
84
+ if(this.printWriter != null) {
85
+ this.printWriter.write(b_msg);
86
+ this.printWriter.write('\n');
87
+ } else {
88
+ this.openFile();
89
+ }
90
+ sysout = (sysout || process.env.WHATAP_PRINT);
91
+ if(sysout) {
92
+ console.log(b_msg);
93
+ }
94
+ } catch (e){
95
+ if(sysout) {
96
+ console.log(e);
97
+ }
98
+ }
99
+ },
100
+ printError : function (id, message, err, sysout) {
101
+ if(this.checkOk(id, 10) == false) {
102
+ return;
103
+ }
104
+ this.print(id, message, false);
105
+ sysout = (sysout || process.env.WHATAP_PRINT);
106
+ if(sysout) {
107
+ console.error(this.build(id, message));
108
+ }
109
+ if(err) {
110
+ if(this.printWriter != null) {
111
+ this.printWriter.write(err.stack);
112
+ this.printWriter.write('\n');
113
+ }
114
+ }
115
+ },
116
+ checkOk : function (id, sec) {
117
+ if(conf.log_print_enabled === false) { return false; }
118
+ if(conf.isIgnoreLog && conf.isIgnoreLog(id)) { return false; }
119
+
120
+ if(Object.keys(Logger.lastLog).length >= 1000) {
121
+ Logger.lastLog = {};
122
+ }
123
+
124
+ if(sec > 0) {
125
+ var last = Logger.lastLog[id];
126
+ if(last == null) {
127
+ last = 0;
128
+ }
129
+ var now = Date.now();
130
+ if(now < last + sec * 1000) {
131
+ return false;
132
+ }
133
+ Logger.lastLog[id] = now;
134
+ }
135
+ return true;
136
+ },
137
+ build : function (id, message) {
138
+ var str = DateUtil.datetime(Date.now());
139
+ str += ' [';
140
+ str += id;
141
+ str += '] <' + PID + '> ';
142
+ str += message;
143
+ return str;
144
+ },
145
+ openFile : function () {
146
+ if(conf.log_file_enabled === false ) { return; }
147
+ var log_prefix = WHATAP_CONF+"-";
148
+
149
+ var root = conf['app.root'];
150
+ if(root==null || root ==undefined){
151
+ console.log('[WHATAP]Logger Error - WHATAP ROOT DIR IS NULL!!!!!!!!!');
152
+ return;
153
+ }
154
+ var dir = path.join(root, 'logs');
155
+ if(fs.existsSync(dir) == false) {
156
+ fs.mkdirSync(dir);
157
+ }
158
+
159
+ if(conf.log_rotation_enabled) {
160
+ var file = path.join(dir, log_prefix + DateUtil.yyyymmdd() + '.log');
161
+ this.logfile = file;
162
+ this.printWriter = fs.createWriteStream(file, {flags : 'a'});
163
+ } else {
164
+ var file = path.join(dir, 'whatap.log');
165
+ this.logfile = file;
166
+ this.printWriter = fs.createWriteStream(file, {flags : 'a'});
167
+ }
168
+
169
+ },
170
+ clearOldLog : function () {
171
+ if(conf.log_rotation_enabled === false || conf.log_enabled === false) { return; }
172
+ if(conf.log_keep_days <= 0) { return; }
173
+
174
+ var nowUnit = DateUtil.getDateUnit(),
175
+ root = conf['app.root'],
176
+ dir = path.join(root, 'logs'),
177
+ log_prefix = WHATAP_CONF+"-";
178
+
179
+ fs.readdir(dir, function (err, files) {
180
+
181
+ for(var i=0; i<files.length; i++) {
182
+ var stat = fs.statSync(path.join(dir, files[i]));
183
+ if(stat.isDirectory()) {
184
+ return true;
185
+ }
186
+ var name = files[i];
187
+ if(name.indexOf(log_prefix) < 0) {
188
+ return true;
189
+ }
190
+ var x = name.lastIndexOf('.');
191
+ if(x < 0) {
192
+ return true;
193
+ }
194
+ var date = name.substr(log_prefix.length + 1, (x - log_prefix.length - 1));
195
+ if(date.length != 8) {
196
+ return true;
197
+ }
198
+ var d = DateUtil.yyyymmdd(date);
199
+ var fileUnit = DateUtil.getDateUnit(d);
200
+ try {
201
+ if (nowUnit - fileUnit > conflog_keep_days) {
202
+ fs.unlinkSync(path.join(dir, files[i]));
203
+ }
204
+ } catch (e) { }
205
+ }
206
+
207
+ });
208
+ },
209
+ read : function( file, endpos, length , callback) {
210
+
211
+ if ( file == null || length === 0)
212
+ return null;
213
+ if (file.startsWith(WHATAP_CONF) == false)
214
+ return null;
215
+
216
+
217
+
218
+ var root = conf['app.root'];
219
+ if(root==null ){
220
+ return null;
221
+ }
222
+ var dir = path.join(root, 'logs');
223
+ var fileFullPath = path.join(dir, file);
224
+
225
+ if(fs.existsSync(fileFullPath) == false) {
226
+ return null;
227
+ }
228
+ const stats = fs.statSync(fileFullPath);
229
+
230
+ if (endpos < 0) {
231
+ endpos = stats.size;
232
+ }
233
+
234
+ var start = Math.max(0, endpos - length);
235
+
236
+ if ( stats.size < start)
237
+ return null;
238
+
239
+ var available = stats.size - start;
240
+ var readable = Math.min(available, length);
241
+ var next=-1;
242
+ var buffer = Buffer.alloc(readable);
243
+ fs.open(fileFullPath, 'r', function (err, fd) {
244
+ fs.read(fd, buffer, 0, buffer.length, start,function(e,l,b){
245
+ next = endpos + l;
246
+ if (next > stats.size) {
247
+ next = -1;
248
+ }
249
+ callback(start, next,b.toString("utf8",0,l)) ;
250
+ });
251
+ fs.close(fd);
252
+ });
233
253
 
234
- var start = Math.max(0, endpos - length);
235
-
236
- if ( stats.size < start)
237
- return null;
238
-
239
- var available = stats.size - start;
240
- var readable = Math.min(available, length);
241
- var next=-1;
242
- var buffer = Buffer.alloc(readable);
243
- fs.open(fileFullPath, 'r', function (err, fd) {
244
- fs.read(fd, buffer, 0, buffer.length, start,function(e,l,b){
245
- next = endpos + l;
246
- if (next > stats.size) {
247
- next = -1;
248
- }
249
- callback(start, next,b.toString("utf8",0,l)) ;
250
- });
251
- fs.close(fd);
252
- });
253
-
254
- },
255
- getLogFiles : function () {
256
- var MapValue = require('./value/map-value');
257
- var log_prefix = WHATAP_CONF+"-";
258
-
259
- var o = new MapValue();
260
- if(conf.log_file_enabled === false ) { return o; }
261
- var root = conf['app.root'];
262
- if(root==null){
263
- return o;
264
- }
265
- var dir = path.join(root, 'logs');
266
- if(fs.existsSync(dir) === false) {
267
- return o;
268
- }
269
- var agoOneMonthTime=DateUtil.getMonth(Date.now(), -1);
270
-
271
- if(conf.log_rotation_enabled) {
272
- var files = fs.readdirSync(dir);
273
- files.forEach(function (file) {
274
- if (file.startsWith(log_prefix) == false) {
275
- return;
276
- }
277
- var x = file.lastIndexOf('.');
278
- if (x < 0) {
279
- return;
280
- }
281
- var date = file.substring(log_prefix.length , x);
282
- if (date.length != 8) {
283
- return;
284
- }
285
- if (DateUtil.yyyymmdd(date) < agoOneMonthTime) {
286
- return;
287
- }
288
- const stats = fs.statSync(dir + '/'+file);
289
- if(stats){
290
- o.putLong(file, stats.size);
291
- }
292
- });
293
- } else {
294
- if (fs.existsSync(dir + "/whatap.log")) {
295
- const stats = fs.statSync(dir + "/whatap.log");
296
- o.putLong(file, stats.size);
297
- }
298
- }
299
- return o;
300
- },
301
- initializer : initializer,
302
- CODE: {
303
-
304
- }
305
- };
306
-
307
- module.exports = Logger;
254
+ },
255
+ getLogFiles : function () {
256
+ var MapValue = require('./value/map-value');
257
+ var log_prefix = WHATAP_CONF+"-";
258
+
259
+ var o = new MapValue();
260
+ if(conf.log_file_enabled === false ) { return o; }
261
+ var root = conf['app.root'];
262
+ if(root==null){
263
+ return o;
264
+ }
265
+ var dir = path.join(root, 'logs');
266
+ if(fs.existsSync(dir) === false) {
267
+ return o;
268
+ }
269
+ var agoOneMonthTime=DateUtil.getMonth(Date.now(), -1);
270
+
271
+ if(conf.log_rotation_enabled) {
272
+ var files = fs.readdirSync(dir);
273
+ files.forEach(function (file) {
274
+ if (file.startsWith(log_prefix) == false) {
275
+ return;
276
+ }
277
+ var x = file.lastIndexOf('.');
278
+ if (x < 0) {
279
+ return;
280
+ }
281
+ var date = file.substring(log_prefix.length , x);
282
+ if (date.length != 8) {
283
+ return;
284
+ }
285
+ if (DateUtil.yyyymmdd(date) < agoOneMonthTime) {
286
+ return;
287
+ }
288
+ const stats = fs.statSync(dir + '/'+file);
289
+ if(stats){
290
+ o.putLong(file, stats.size);
291
+ }
292
+ });
293
+ } else {
294
+ if (fs.existsSync(dir + "/whatap.log")) {
295
+ const stats = fs.statSync(dir + "/whatap.log");
296
+ o.putLong(file, stats.size);
297
+ }
298
+ }
299
+ return o;
300
+ },
301
+ initializer : initializer,
302
+ CODE: {
303
+
304
+ }
305
+ };
306
+
307
+ module.exports = Logger;
@@ -41,9 +41,9 @@ TcpSession.prototype.open = function(cb){
41
41
  if(cb) return cb(new Error('PCODE is not defined..'));
42
42
  }
43
43
  if(this.isOpen()) {
44
- ++reconnectCnt;
45
- if(reconnectCnt === 3) {
46
- this.close();
44
+ ++self.reconnectCnt;
45
+ if(self.reconnectCnt === 3) {
46
+ self.close();
47
47
  }
48
48
  return cb(new Error('Already connected..'));
49
49
  }
@@ -4,7 +4,9 @@
4
4
  * can be found in the LICENSE file.
5
5
  */
6
6
 
7
+ const { reqlog_x_txid } = require('../conf/config-default');
7
8
  const controlHandler = require('../control/control-handler');
9
+
8
10
  var TraceContextManager = require('../trace/trace-context-manager'),
9
11
  URLPatternDetector = require('../trace/serviceurl-pattern-detector').Detector,
10
12
  DataTextAgent = require('../data/datatext-agent'),
@@ -124,6 +126,8 @@ HttpObserver.prototype.__createTransactionObserver = function(callback, isHttps,
124
126
  if (ctx.status >= 4 && ctx.error.isZero()) {
125
127
  ctx.error = StatError.addError(obj.statusCode, obj.statusMessage,
126
128
  ctx.service_hash);
129
+ ctx.statusCode = obj.statusCode;
130
+ ctx.statusMessage = obj.statusMessage;
127
131
  }
128
132
 
129
133
  self.__endTransaction(null, ctx, req, res);
@@ -356,7 +360,7 @@ HttpObserver.prototype.__endTransaction = function(error, ctx, req, res) {
356
360
  wtx.endTime = DateUtil.currentTime();
357
361
  profile.time = wtx.endTime;
358
362
  wtx.elapsed = ctx.getElapsedTime();
359
-
363
+
360
364
  ctx.service_hash = HashUtil.hashFromString(ctx.service_name);
361
365
  DataTextAgent.SERVICE.add(ctx.service_hash, ctx.service_name);
362
366
 
@@ -385,7 +389,7 @@ HttpObserver.prototype.__endTransaction = function(error, ctx, req, res) {
385
389
  wtx.status = ctx.status;
386
390
 
387
391
  wtx.http_method=TxRecord.HTTP_METHOD[ctx.http_method] || TxRecord.WEB_GET;
388
-
392
+ wtx.http_host = ctx.http_host;
389
393
  wtx.mtid=ctx.mtid;
390
394
  wtx.mdepth=ctx.mdepth;
391
395
  wtx.mcaller=ctx.mcaller_txid;
@@ -406,6 +410,7 @@ HttpObserver.prototype.__endTransaction = function(error, ctx, req, res) {
406
410
  TraceContextManager.end(ctx._id);
407
411
  ctx = null;
408
412
  }, 100);
413
+
409
414
  } catch (e) {
410
415
  Logger.printError('WHATAP-607', 'End transaction error..', e, false);
411
416
  TraceContextManager.end(ctx._id);
@@ -603,7 +608,11 @@ HttpObserver.prototype.inject = function( mod, moduleName ) {
603
608
  if (step.error.isZero()) {
604
609
  step.error = StatError.addError(statusCode, response.statusMessage , ctx.service_hash,
605
610
  TextTypes.HTTPC_URL, step.url);
606
- if (ctx.error.isZero()) { ctx.error = step.error; }
611
+ if (ctx.error.isZero()) {
612
+ ctx.error = step.error;
613
+ ctx.statusCode = statusCode;
614
+ ctx.statusMessage = response.statusMessage;
615
+ }
607
616
  }
608
617
  }
609
618
  })
@@ -613,7 +622,11 @@ HttpObserver.prototype.inject = function( mod, moduleName ) {
613
622
  if (step.error.isZero()) {
614
623
  step.error = StatError.addError(err.code, err.message, ctx.service_hash,
615
624
  TextTypes.HTTPC_URL, step.url);
616
- if (ctx.error.isZero()) { ctx.error = step.error; }
625
+ if (ctx.error.isZero()) {
626
+ ctx.error = step.error;
627
+ ctx.statusCode = err.code;
628
+ ctx.statusMessage = err.message;
629
+ }
617
630
  }
618
631
 
619
632
  endHttpc(ctx, step);
@@ -661,6 +674,8 @@ HttpObserver.prototype.inject = function( mod, moduleName ) {
661
674
  step.error = StatError.addError('Timeout','Timeout', ctx.service_hash);
662
675
  if (ctx.error.isZero()) {
663
676
  ctx.error = step.error;
677
+ ctx.statusCode = 'Timeout';
678
+ ctx.statusMessage = 'Timeout';
664
679
  }
665
680
  }
666
681
  endHttpc(ctx, step);
@@ -104,10 +104,11 @@ TraceContext.prototype.footprint=function(desc){
104
104
  }
105
105
  TraceContext.prototype.getElapsedTime = function () {
106
106
  return Date.now() - this.start_time;
107
- };
107
+ }
108
108
  TraceContext.prototype.resetStartTime = function () {
109
109
  this.start_time = Date.now();
110
- };
110
+ }
111
+
111
112
  var poids= new StringKeyLinkedMap(7, 1).setMax(301);
112
113
  TraceContext.prototype.setCallerPOID= function (poidStr) {
113
114
  try {
@@ -45,6 +45,7 @@ function ResourceProfile() {
45
45
  /** Process cpu */
46
46
  setInterval(function () {
47
47
  pusage.stat(process.pid, function(err, stat) {
48
+ if(err || stat == null) return;
48
49
  self.pcpu = stat.cpu;
49
50
  self.cpu_info.proc = stat.cpu;
50
51
  });
package/package.json CHANGED
@@ -1,8 +1,8 @@
1
1
  {
2
2
  "name": "whatap",
3
3
  "homepage": "http://www.whatap.io",
4
- "version": "0.4.49",
5
- "releaseDate": "20220614",
4
+ "version": "0.4.52",
5
+ "releaseDate": "20220712",
6
6
  "description": "Monitoring and Profiling Service",
7
7
  "main": "index.js",
8
8
  "scripts": {},