whatap 0.5.6 → 0.5.8

package/lib/conf/config-default.js

@@ -267,7 +267,11 @@ var ConfigDefault = {
     "grpc_profile_ignore_method": bool("grpc_profile_ignore_method", true),
 
     "oname_port_postfix_enabled": bool("oname_port_postfix_enabled", false),
-    "ignore_http_lost_connection": bool("ignore_http_lost_connection", false)
+    "ignore_http_lost_connection": bool("ignore_http_lost_connection", false),
+
+    "profile_graphql_enabled": bool("profile_graphql_enabled", true),
+    "profile_graphql_variable_enabled": bool("profile_graphql_variable_enabled", false),
+    "ignore_graphql_operation": str("ignore_graphql_operation", '')
 };
 
 ConfigDefault._hook_method_ignore_prefix = ConfigDefault.hook_method_ignore_prefixes.split(',');

package/lib/core/agent.js

@@ -30,7 +30,9 @@ var Interceptor      = require('./interceptor').Interceptor,
     PromiseObserver  = require('../observers/promise-observer').PromiseObserver,
     PgSqlObserver    = require('../observers/pgsql-observer').PgSqlObserver,
     ScheduleObserver = require('../observers/schedule-observer').ScheduleObserver,
-    GRpcObserver     = require('../observers/grpc-observer').GRpcObserver;
+    GRpcObserver     = require('../observers/grpc-observer').GRpcObserver,
+    ApolloObserver   = require('../observers/apollo-server-observer').ApolloServerObserver;
+
 
 var Configuration    = require('./../conf/configure'),
     SecurityMaster   = require('./../net/security-master'),
@@ -268,6 +270,7 @@ NodeAgent.prototype.loadObserves = function() {
     observes.push(PgSqlObserver);
     observes.push(ScheduleObserver);
     // observes.push(GRpcObserver);
+    observes.push(ApolloObserver);
 
     var packageToObserve = {};
     observes.forEach(function(observeObj) {

package/lib/observers/apollo-server-observer.js

@@ -0,0 +1,155 @@
+/**
+ * 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 TraceContextManager = require('../trace/trace-context-manager'),
+    conf = require('../conf/configure'),
+    Logger = require('../logger');
+const HashUtil = require('../util/hashutil');
+const DataTextAgent = require('../data/datatext-agent');
+const MessageStep = require('../step/message-step');
+const shimmer = require('../core/shimmer');
+const StatError = require("../stat/stat-error");
+const TextTypes = require("../lang/text-types");
+
+var profile_graphql_enabled = conf.getProperty('profile_graphql_enabled', true);
+var profile_graphql_variable_enabled = conf.getProperty('profile_graphql_variable_enabled', false);
+var ignore_graphql_operation = conf.getProperty('ignore_graphql_operation', '');
+
+conf.on('profile_graphql_enabled', function(newProperty) {
+    profile_graphql_enabled = newProperty;
+});
+conf.on('profile_graphql_variable_enabled', function(newProperty) {
+    profile_graphql_variable_enabled = newProperty;
+});
+conf.on('ignore_graphql_operation', function(newProperty) {
+    ignore_graphql_operation = newProperty;
+});
+
+var ApolloServerObserver = function(agent) {
+    this.agent = agent;
+    this.packages = ['@apollo/server'];
+};
+
+function checkIgnoreOperation(ignore_operation, operation_name) {
+    try {
+        let ignore_operation_set = null;
+        if (ignore_operation) {
+            ignore_operation_set = new Set(ignore_operation.split(','));
+        } else {
+            ignore_operation_set = null;
+        }
+        if (ignore_operation_set && ignore_operation_set.has(operation_name)) {
+            return true;
+        }
+    } catch (e) {
+        Logger.printError('WHATAP-803', 'GraphQL checkIgnoreOperation error: ' + e, false);
+    }
+    return false;
+}
+
+function wrapExecuteHTTPGraphQLRequest(original) {
+    return async function executeHTTPGraphQLRequest() {
+        if (!profile_graphql_enabled) {
+            return original.apply(this, arguments);
+        }
+
+        try {
+            var ctx = TraceContextManager.getCurrentContext();
+            if (!ctx) {
+                return original.apply(this, arguments);
+            }
+
+            const [requestContext] = arguments;
+            const { httpGraphQLRequest } = requestContext;
+            const { body } = httpGraphQLRequest;
+
+            const operationName = body.operationName;
+            if (checkIgnoreOperation(ignore_graphql_operation, operationName)) {
+                TraceContextManager.end(ctx._id)
+                return original.apply(this, arguments);
+            }
+
+            const originalServiceName = ctx.service_name || '';
+            if(operationName){
+                ctx.service_name = `${originalServiceName}?operationName=${operationName}`;
+                ctx.service_hash = HashUtil.hashFromString(ctx.service_name);
+            }
+
+            // Operation Type Step (query)
+            if(body.query && body.query.trim()){
+                var step_type = new MessageStep();
+                step_type.hash = HashUtil.hashFromString('Type');
+                step_type.start_time = ctx.getElapsedTime();
+                step_type.desc = body.query.trim().startsWith('mutation') ? 'mutation' : 'query';
+                DataTextAgent.MESSAGE.add(step_type.hash, "Type");
+                ctx.profile.push(step_type);
+            }
+
+            // Operation Name Step
+            if(operationName){
+                var step_operation = new MessageStep();
+                step_operation.hash = HashUtil.hashFromString('Operation');
+                step_operation.start_time = ctx.getElapsedTime();
+                step_operation.desc = operationName || 'anonymous';
+                DataTextAgent.MESSAGE.add(step_operation.hash, "Operation");
+                ctx.profile.push(step_operation);
+            }
+
+            // Variables Step
+            if (profile_graphql_variable_enabled && body.variables && Object.keys(body.variables).length > 0) {
+                var step_variables = new MessageStep();
+                step_variables.hash = HashUtil.hashFromString('Variables');
+                step_variables.start_time = ctx.getElapsedTime();
+                step_variables.desc = JSON.stringify(Object.keys(body.variables));
+                DataTextAgent.MESSAGE.add(step_variables.hash, "Variables");
+                ctx.profile.push(step_variables);
+            }
+
+            const response = await original.apply(this, arguments);
+
+            // 에러 처리
+            if (response.body.kind === 'complete' && response.body.string.includes('"errors"')) {
+                try {
+                    const result = JSON.parse(response.body.string);
+                    if (result.errors && result.errors.length > 0) {
+                        const errorMessages = result.errors.map(error => error.message).join('\n');
+                        ctx.statusCode = 500;
+                        ctx.error_message = errorMessages;
+                    }
+                } catch (e) {
+                    Logger.printError('WHATAP-802', 'GraphQL error parsing failed', e, false);
+                }
+            }
+
+            return response;
+
+        } catch (err) {
+            Logger.printError('WHATAP-801', 'GraphQL executeHTTPGraphQLRequest error: ' + err, false);
+            if (ctx) {
+                ctx.statusCode = 500;
+                ctx.error_message = err.stack;
+            }
+            return original.apply(this, arguments);
+        }
+    };
+}
+
+ApolloServerObserver.prototype.inject = function(mod, moduleName) {
+    if (mod.__whatap_observe__) {
+        return;
+    }
+    mod.__whatap_observe__ = true;
+    Logger.initPrint("ApolloServerObserver");
+
+    if (profile_graphql_enabled) {
+        // Hook ApolloServer
+        if (mod.ApolloServer && mod.ApolloServer.prototype) {
+            shimmer.wrap(mod.ApolloServer.prototype, 'executeHTTPGraphQLRequest', wrapExecuteHTTPGraphQLRequest);
+        }
+    }
+};
+
+exports.ApolloServerObserver = ApolloServerObserver;

package/lib/util/nodeutil.js

@@ -6,19 +6,23 @@
 
 var fs      = require('fs'),
     path    = require('path');
+const { execSync } = require('child_process');
 
-function getPackageJson(){
-    var appDir = require('./../conf/configure')['app.root'];
+function getPackageJson() {
     try {
-        var whatap_path = path.join(
-            appDir,
-            'node_modules',
-            'whatap',
-            'package.json');
-        NodeUtil.packageJson = require(whatap_path, 'utf8');
+        const whatapPath = require.resolve('whatap/package.json');
+        NodeUtil.packageJson = require(whatapPath);
         return;
     } catch(e) {
     }
+
+    try{
+        const globalPath = execSync('npm root -g').toString().trim();
+        const globalWhatapPath = path.join(globalPath, 'whatap', 'package.json');
+        NodeUtil.packageJson = require(globalWhatapPath);
+        return;
+    }catch (e) {
+    }
     NodeUtil.packageJson = {};
 }
 function recursiveCall(fullPath, file, cb){
@@ -65,4 +69,4 @@ var NodeUtil = {
     packageJson : {}
 };
 
-module.exports = NodeUtil;
+module.exports = NodeUtil;

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "whatap",
   "homepage": "http://www.whatap.io",
-  "version": "0.5.6",
-  "releaseDate": "20250123",
+  "version": "0.5.8",
+  "releaseDate": "20250218",
   "description": "Monitoring and Profiling Service",
   "main": "index.js",
   "scripts": {},