whatap 0.5.19 → 0.5.21

package/lib/observers/http-observer.js

@@ -126,6 +126,23 @@ conf.on('ignore_build_file_enabled', function (newProps) {
 conf.on('ignore_build_file_path', function (newProps) {
     ignore_build_file_path = newProps;
 })
+
+let _trace_mtrace_traceparent_key = conf.getProperty('trace_mtrace_traceparent_key', 'traceparent');
+let custom_trace_header_enabled = conf.getProperty('custom_trace_header_enabled', false);
+let custom_trace_header_key = conf.getProperty('custom_trace_header_key', null);
+
+// conf 리스너 추가
+conf.on('trace_mtrace_traceparent_key', function(newProperty) {
+    _trace_mtrace_traceparent_key = newProperty;
+});
+
+conf.on('custom_trace_header_enabled', function(newProperty) {
+    custom_trace_header_enabled = newProperty;
+});
+
+conf.on('custom_trace_header_key', function(newProperty) {
+    custom_trace_header_key = newProperty;
+});
 var staticConents = function (newProps) {
     var x=new Set();
     var words = !newProps?[]:newProps.split(',');
@@ -379,26 +396,69 @@ function initCtx(req, res) {
     /*   Multi Server Transaction Trace */
     /************************************/
     if(conf.getProperty('mtrace_enabled', false)) {
-        var poid=req.headers['x-wtap-po'];
+        // traceparent 헤더 처리 (W3C Trace Context 표준)
+        const traceparentKey = req.headers[conf._trace_mtrace_traceparent_key];
+        let hasTraceparentKey = false;
+        let traceparentStepId = 0;
+
+        if (traceparentKey) {
+            hasTraceparentKey = true;
+            const parts = traceparentKey.trim().split('-');
+
+            if (parts.length >= 4) {
+                // parts[0]: version (00)
+                // parts[1]: 32자리 16진수 trace ID
+                // parts[2]: 16자리 16진수 parent ID (span ID)
+                // parts[3]: 2자리 16진수 trace flags
+
+                const mcallerTraceIdValue = parts[1];
+                ctx.mcallerTraceparentValue = mcallerTraceIdValue;
+
+                try {
+                    // trace ID의 뒤 16자리를 가져와서 long으로 변환
+                    const mtidHex = mcallerTraceIdValue.substring(16);
+                    const mtidLong = Long.fromString(mtidHex, true, 16);
+                    ctx.mtid = mtidLong;
+
+                    if (!ctx.mtid.isZero()) {
+                        ctx.mtid_build_checked = true;
+                    }
+                } catch (e) {
+                    Logger.printError('WHATAP-851', 'traceparent parse error', e, true);
+                }
+
+                try {
+                    // parent span ID 추출
+                    const parentSpanId = Long.fromString(parts[2], true, 16);
+                    ctx.mcaller_stepId = parentSpanId;
+                    traceparentStepId = parentSpanId;
+                } catch (e) {
+                    Logger.printError('WHATAP-851', 'traceparent span id parse error', e, true);
+                }
+            }
+        }
+
+        // WhaTap 고유 헤더 처리
+        const poid = req.headers['x-wtap-po'];
         if (poid != null) {
             ctx.setCallerPOID(poid);
-            try{
-                var mt_caller=req.headers[conf._trace_mtrace_caller_key];
-                if(mt_caller){
-                    var x = mt_caller.indexOf(',');
+
+            try {
+                const mt_caller = req.headers[conf._trace_mtrace_caller_key];
+                if(mt_caller) {
+                    const x = mt_caller.indexOf(',');
                     if (x > 0) {
                         ctx.mtid = Hexa32.toLong32(mt_caller.substring(0, x));
                         ctx.mtid_build_checked = true;
-                        var y = mt_caller.indexOf(',', x + 1);
+                        const y = mt_caller.indexOf(',', x + 1);
                         if (y > 0) {
                             ctx.mdepth = parseInt(mt_caller.substring(x + 1, y));
-                            var z = mt_caller.indexOf(',', y + 1);
+                            const z = mt_caller.indexOf(',', y + 1);
                             if (z < 0) {
                                 ctx.mcaller_txid = Hexa32.toLong32(mt_caller.substring(y + 1));
                             } else {
                                 ctx.mcaller_txid = Hexa32.toLong32(mt_caller.substring(y + 1, z));
-
-                                var z2 = mt_caller.indexOf(',', z + 1);
+                                const z2 = mt_caller.indexOf(',', z + 1);
                                 if (z2 < 0) {
                                     ctx.mcaller_stepId = Hexa32.toLong32(mt_caller.substring(z + 1));
                                 } else {
@@ -408,18 +468,69 @@ function initCtx(req, res) {
                         }
                     }
                 }
+
                 if (conf.stat_mtrace_enabled) {
-                    var inf=req.headers[conf._trace_mtrace_spec_key1];
-                    if(inf != null && inf.length > 0){
-                        var px = inf.indexOf(',');
-                        ctx.mcaller_spec =  inf.substring(0, px);
+                    const inf = req.headers[conf._trace_mtrace_spec_key1];
+                    if(inf != null && inf.length > 0) {
+                        const px = inf.indexOf(',');
+                        ctx.mcaller_spec = inf.substring(0, px);
                         ctx.mcaller_url = inf.substring(px + 1);
                     }
                 }
             } catch(e) {
-                Logger.printError('WHATAP-850', 'Multi Server Transaction ', e, true);
+                Logger.printError('WHATAP-850', 'Multi Server Transaction', e, true);
             }
         }
+
+        // Gateway가 header를 그대로 전달하는 경우 처리
+        if (hasTraceparentKey) {
+            if (!traceparentStepId.equals(ctx.mcaller_stepId)) {
+                ctx.mcaller_stepId = traceparentStepId;
+                ctx.mcaller_txid = Long.ZERO;
+            }
+        }
+    }
+
+    var poid=req.headers['x-wtap-po'];
+    if (poid != null) {
+        ctx.setCallerPOID(poid);
+        try{
+            var mt_caller=req.headers[conf._trace_mtrace_caller_key];
+            if(mt_caller){
+                var x = mt_caller.indexOf(',');
+                if (x > 0) {
+                    ctx.mtid = Hexa32.toLong32(mt_caller.substring(0, x));
+                    ctx.mtid_build_checked = true;
+                    var y = mt_caller.indexOf(',', x + 1);
+                    if (y > 0) {
+                        ctx.mdepth = parseInt(mt_caller.substring(x + 1, y));
+                        var z = mt_caller.indexOf(',', y + 1);
+                        if (z < 0) {
+                            ctx.mcaller_txid = Hexa32.toLong32(mt_caller.substring(y + 1));
+                        } else {
+                            ctx.mcaller_txid = Hexa32.toLong32(mt_caller.substring(y + 1, z));
+
+                            var z2 = mt_caller.indexOf(',', z + 1);
+                            if (z2 < 0) {
+                                ctx.mcaller_stepId = Hexa32.toLong32(mt_caller.substring(z + 1));
+                            } else {
+                                ctx.mcaller_stepId = Hexa32.toLong32(mt_caller.substring(z + 1, z2));
+                            }
+                        }
+                    }
+                }
+            }
+            if (conf.stat_mtrace_enabled) {
+                var inf=req.headers[conf._trace_mtrace_spec_key1];
+                if(inf != null && inf.length > 0){
+                    var px = inf.indexOf(',');
+                    ctx.mcaller_spec =  inf.substring(0, px);
+                    ctx.mcaller_url = inf.substring(px + 1);
+                }
+            }
+        } catch(e) {
+            Logger.printError('WHATAP-850', 'Multi Server Transaction ', e, true);
+        }
     }
 
     return ctx;
@@ -543,6 +654,15 @@ HttpObserver.prototype.__endTransaction = function(error, ctx, req, res) {
         wtx.mcaller_okind = ctx.mcaller_okind;
         wtx.mcaller_oid = ctx.mcaller_oid;
 
+        wtx.appctx = "";
+        wtx.txName = ctx.service_name;
+        if(ctx.error_class) wtx.error_class = ctx.error_class;
+        if(ctx.error_message) wtx.error_message = ctx.error_message;
+
+        if(conf.getProperty('txtext_txname_enabled', true)){
+            wtx.txName = ctx.service_name;
+        }
+
         MeterService.add(wtx.service, wtx.elapsed,
             wtx.errorLevel, ctx.mcaller_pcode, ctx.mcaller_okind, ctx.mcaller_oid);
 
@@ -780,7 +900,8 @@ HttpObserver.prototype.inject = function( mod, moduleName ) {
                     if (ctx.error.isZero()) {
                         ctx.error = step.error;
                         ctx.statusCode = err.code;
-                        ctx.statusMessage = err.message;
+                        ctx.statusMessage = ctx.error_message = err.message;
+
                     }
                 }
 
@@ -893,4 +1014,13 @@ var toParamBytes = function (p, crc) {
     }
 };
 
+function createMtraceId(userAgentString) {
+    // MTraceHelper.createId 구현
+    if (userAgentString) {
+        // userAgent 기반으로 ID 생성
+        return KeyGen.next();
+    }
+    return KeyGen.next();
+}
+
 exports.HttpObserver = HttpObserver;

package/lib/observers/maria-observer.js

@@ -20,7 +20,6 @@ var TraceContextManager = require('../trace/trace-context-manager'),
     TextTypes           = require('../lang/text-types'),
     ParamSecurity       = require('../util/paramsecurity'),
     Logger              = require('../logger'),
-    conf                = require('../conf/configure'),
     DateUtil            = require('../util/dateutil'),
     Buffer              = require('buffer').Buffer,
     shimmer             = require('../core/shimmer'),

package/lib/observers/mongodb-observer.js

@@ -161,8 +161,11 @@ MongodbObserver.prototype.inject = function( mod, moduleName ) {
         request.step.elapsed = event.duration;
         request.ctx.sql_time += request.step.elapsed;
 
+        request.ctx.error_class = event.failure.name || (event.failure.constructor && event.failure.constructor.name) || 'MongoDBError';
+        request.ctx.error_message = event.failure.message || 'MongoDB error';
+
         var msgObj = { 'class': event.failure.message, 'msg': event.failure.message };
-        request.step.error = StatError.addError("mogodb", event.failure.message,
+        request.step.error = StatError.addError("mongodb", event.failure.message,
             request.ctx.service_hash,  TextTypes.SQL, request.step.hash);
         if (request.ctx.error.isZero()) {
             request.ctx.error = request.step.error;