whatap 0.5.0 → 0.5.2

package/lib/conf/config-default.js

@@ -264,6 +264,8 @@ var ConfigDefault = {
     "grpc_profile_stream_client_enabled": bool("grpc_profile_stream_client_enabled", true),
     "grpc_profile_stream_server_enabled": bool("grpc_profile_stream_server_enabled", true),
     "grpc_profile_ignore_method": bool("grpc_profile_ignore_method", true),
+
+    "oname_port_postfix_enabled": bool("oname_port_postfix_enabled", false),
 };
 
 ConfigDefault._hook_method_ignore_prefix = ConfigDefault.hook_method_ignore_prefixes.split(',');

package/lib/net/security-master.js

@@ -105,7 +105,7 @@ var SecurityMaster = {
         }
 
         //OidUtil.setCmd(Configuration.getProperty("sun.java.command"));
-        this.ONAME = OidUtil.mkOname(Configuration.getProperty("whatap.name", name_pattern));
+        this.ONAME = OidUtil.mkOname(Configuration.getProperty("whatap.name", name_pattern), port);
         this.OID = OidUtil.mkOid(this.ONAME);
 
         if (lastOid != this.OID) {

package/lib/observers/global-observer.js

@@ -15,12 +15,20 @@ const KeyGen = require("../util/keygen");
 const HashUtil = require("../util/hashutil");
 const DataTextAgent = require("../data/datatext-agent");
 const shimmer = require('../core/shimmer');
+const StatError = require("../stat/stat-error");
+const TextTypes = require("../lang/text-types");
+const URLPatternDetector  = require('../trace/serviceurl-pattern-detector').Detector;
 
 var GlobalObserver = function (agent) {
     this.agent = agent;
     this.packages = ['global'];
 }
 
+var transaction_status_error_enable = conf.getProperty('transaction_status_error_enable', true);
+conf.on('transaction_status_error_enable', function (newProps) {
+    transaction_status_error_enable = newProps;
+})
+
 GlobalObserver.prototype.inject = function (mod, moduleName) {
     var self = this;
 
@@ -37,7 +45,7 @@ GlobalObserver.prototype.inject = function (mod, moduleName) {
     });
 
     shimmer.wrap(mod, 'fetch', function(original) {
-        return function(...args) {
+        return async function(...args) {
             var info = args[1] ? args[1] : {};
             var ctx = TraceContextManager._asyncLocalStorage.getStore();
 
@@ -45,51 +53,103 @@ GlobalObserver.prototype.inject = function (mod, moduleName) {
                 interTxTraceAutoOn(ctx);
 
                 if (conf.mtrace_enabled) {
-                    if (info.headers) {
-                        info.headers['x-wtap-po'] = transferPOID(ctx);
-                    } else {
-                        info.headers = {
-                            'x-wtap-po': transferPOID(ctx)
-                        };
-                    }
-                    if (conf.stat_mtrace_enabled) {
-                        info.headers[conf._trace_mtrace_spec_key1] = transferSPEC_URL(ctx);
-                    }
-                    if (conf.mtid_mtrace_enabled && ctx.mtid.isZero() === false) {
-                        info.headers[conf._trace_mtrace_caller_key] = transferMTID_CALLERTX(ctx);
-                    }
+                    addTraceHeaders(info, ctx);
                     args[1] = info;
                 }
             }
 
-            const promise = original.apply(this, args);
-
-            promise.then(response => {
-                var ctx = TraceContextManager._asyncLocalStorage.getStore();
-                if (ctx && args[0]) {
-                    const url = new URL(args[0]);
-                    ctx.httpc_host = url.hostname;
-                    ctx.httpc_url = url.pathname;
-                    ctx.httpc_port = url.port || (url.protocol === 'https:' ? 443 : 80);
-
-                    var step = new HttpStepX();
-                    step.start_time = ctx.getElapsedTime();
-                    step.url = HashUtil.hashFromString(ctx.httpc_url);
-                    DataTextAgent.HTTPC_URL.add(step.url, ctx.httpc_url);
-                    step.host = HashUtil.hashFromString(ctx.httpc_host);
-                    DataTextAgent.HTTPC_HOST.add(step.host, ctx.httpc_host);
-                    step.port = ctx.httpc_port;
-
-                    ctx.profile.push(step);
-                }
-            }).catch(e => {
-                Logger.printError("WHATAP-704", "Promise error occurred during fetch: " + e, false);
-            });
-            return promise;
+            try {
+                const response = await original.apply(this, args);
+                handleResponse(ctx, args, response);
+                return response;
+            } catch (e) {
+                handleError(ctx, args, e);
+                throw e;
+            }
         };
     });
 };
 
+function addTraceHeaders(info, ctx) {
+    if (info.headers) {
+        info.headers['x-wtap-po'] = transferPOID(ctx);
+    } else {
+        info.headers = {
+            'x-wtap-po': transferPOID(ctx)
+        };
+    }
+    if (conf.stat_mtrace_enabled) {
+        info.headers[conf._trace_mtrace_spec_key1] = transferSPEC_URL(ctx);
+    }
+    if (conf.mtid_mtrace_enabled && ctx.mtid.isZero() === false) {
+        info.headers[conf._trace_mtrace_caller_key] = transferMTID_CALLERTX(ctx);
+    }
+}
+
+function handleResponse(ctx, args, response) {
+    if (!ctx || !args[0]) return;
+
+    const url = new URL(args[0]);
+    setupContext(ctx, url);
+
+    var step = createStep(ctx, url);
+
+    if (!response.ok && transaction_status_error_enable) {
+        recordError(ctx, step, response);
+    }
+
+    ctx.profile.push(step);
+}
+
+function handleError(ctx, args, error) {
+    if (!ctx || !args[0]) return;
+
+    const url = new URL(args[0]);
+    setupContext(ctx, url);
+
+    var step = createStep(ctx, url);
+
+    if (transaction_status_error_enable) {
+        recordError(ctx, step, error);
+    }
+
+    ctx.profile.push(step);
+}
+
+function setupContext(ctx, url) {
+    ctx.httpc_host = url.hostname;
+    ctx.httpc_url = url.pathname;
+    ctx.httpc_port = url.port || (url.protocol === 'https:' ? 443 : 80);
+}
+
+function createStep(ctx, url) {
+    var step = new HttpStepX();
+    step.start_time = ctx.getElapsedTime();
+    step.url = HashUtil.hashFromString(ctx.httpc_url);
+    DataTextAgent.HTTPC_URL.add(step.url, ctx.httpc_url);
+    step.host = HashUtil.hashFromString(ctx.httpc_host);
+    DataTextAgent.HTTPC_HOST.add(step.host, ctx.httpc_host);
+    step.port = ctx.httpc_port;
+    return step;
+}
+
+function recordError(ctx, step, response) {
+    if (step.error.isZero()) {
+        var cleanUrl = ctx.httpc_url.split('?')[0];
+        ctx.service_name = URLPatternDetector.normalize(cleanUrl);
+        ctx.service_hash = HashUtil.hashFromString(ctx.service_name);
+
+        const errorMessage = response.statusText || (response.cause ? response.cause.message : '') || response.message || 'Unknown error';
+        step.error = StatError.addError(response.status || null, errorMessage, ctx.service_hash, TextTypes.HTTPC_URL, step.url);
+
+        if (ctx.error.isZero()) {
+            ctx.error = step.error;
+            ctx.statusCode = response.status || null;
+            ctx.statusMessage = errorMessage;
+        }
+    }
+}
+
 var transfer_poid;
 function transferPOID(ctx) {
     if (transfer_poid)

package/lib/observers/grpc-observer.js

@@ -51,13 +51,10 @@ const types = {
     bidi: 'bidi'
 };
 
-var _module;
-
 GRpcObserver.prototype.inject = function(mod, moduleName) {
     if (mod.__whatap_observe__) {
         return;
     }
-    _module = mod;
     mod.__whatap_observe__ = true;
     Logger.initPrint("GRpcObserver");
 

package/lib/observers/http-observer.js

@@ -199,11 +199,12 @@ HttpObserver.prototype.__createTransactionObserver = function(callback, isHttps,
                 ctx.status = Math.floor(obj.statusCode / 100);
 
                 // 에러가 발생했지만 스택수집안했을 경우
-                if (transaction_status_error_enable && ctx.status >= 4 && ctx.error.isZero()) {
-                    ctx.error = StatError.addError(obj.statusCode, obj.statusMessage,
-                        ctx.service_hash);
+                if (transaction_status_error_enable && ctx.status >= 4) {
+                    if(ctx.error.isZero())
+                        ctx.error = StatError.addError(obj.statusCode, obj.statusMessage, ctx.service_hash);
                     ctx.statusCode = obj.statusCode;
-                    ctx.statusMessage = obj.statusMessage;
+                    ctx.statusTitle = obj.statusMessage;
+                    ctx.statusMessage = ctx.error_message;
                 }
 
                 var requestPath = '';
@@ -244,6 +245,9 @@ function initCtx(req, res) {
     if (ignore_build_file_enabled && ignore_build_file_path && ignore_build_file_path.split(',').some(path => req.url.startsWith(path))) {
         return null;
     }
+    if( conf.getProperty('profile_enabled', true) === false ) {
+        return null;
+    }
 
     var ctx = TraceContextManager.start();
     if(ctx == null) { return null; }
@@ -466,10 +470,11 @@ HttpObserver.prototype.__endTransaction = function(error, ctx, req, res) {
 
     if(profile_error_step_enabled && ctx.statusMessage){
         var step = new MessageStep();
-        step.hash = HashUtil.hashFromString("EXCEPTION");
+        var title = ctx.statusTitle ? ctx.statusTitle : "EXCEPTION";
+        step.hash = HashUtil.hashFromString(title);
         step.start_time = ctx.getElapsedTime();
         step.desc = ctx.statusMessage;
-        DataTextAgent.MESSAGE.add(step.hash, "EXCEPTION");
+        DataTextAgent.MESSAGE.add(step.hash, title);
         ctx.profile.push(step);
     }
 
@@ -649,7 +654,7 @@ HttpObserver.prototype.inject = function( mod, moduleName ) {
     if(mod.__whatap_observe__) { return; }
     mod.__whatap_observe__ = true;
     Logger.initPrint("HttpObserver");
-    if( conf.profile_enabled === false ) { return; }
+    if( conf.getProperty('profile_enabled', true) === false ) { return; }
 
     aop.after(mod, 'createServer', function (obj, args, ret) {
         aop.before(ret, 'listen', function (obj, args) {
@@ -664,7 +669,7 @@ HttpObserver.prototype.inject = function( mod, moduleName ) {
             moduleName === 'https', obj);
     });
 
-    if( conf.httpc_enabled === false ) { return; }
+    if( conf.getProperty('httpc_enabled', true) === false ) { return; }
 
     aop.both(mod, 'request',
         function (obj, args, lctx) {