@shuvi/service 1.0.33 → 1.0.34

package/lib/server/http-server/router.js

@@ -8,8 +8,7 @@ const util_1 = require("util");
 const utils_1 = require("@shuvi/utils");
 const invariant_1 = __importDefault(require("@shuvi/utils/invariant"));
 const router_1 = require("@shuvi/router");
-const trace_1 = require("../trace");
-const trace_2 = require("@shuvi/shared/constants/trace");
+const trace_1 = require("@shuvi/shared/constants/trace");
 class RouterImpl {
     constructor(options) {
         this._routes = [];
@@ -37,8 +36,12 @@ class RouterImpl {
         return this;
     }
     handleRequest(req, res, out) {
-        trace_1.serverRequestTrace
-            .traceChild(trace_2.SERVER_REQUEST.events.SHUVI_SERVER_HANDLE_REQUEST_START.name)
+        const { serverRequestTrace } = req._traces;
+        serverRequestTrace
+            .traceChild(trace_1.SERVER_REQUEST.events.SHUVI_SERVER_HANDLE_REQUEST_START.name, {
+            [trace_1.SERVER_REQUEST.events.SHUVI_SERVER_HANDLE_REQUEST_START.attrs
+                .requestId]: req._requestId
+        })
             .stop();
         let index = 0;
         let done = err => out(err);

package/lib/server/http-server/server.js

@@ -38,11 +38,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Server = void 0;
 const http = __importStar(require("http"));
 const url_1 = require("url");
+const uuid_1 = require("uuid");
 const router_1 = require("@shuvi/router");
 const logger_1 = __importDefault(require("@shuvi/utils/logger"));
 const detect_port_1 = __importDefault(require("detect-port"));
 const utils_1 = require("../utils");
 const router_2 = require("./router");
+const trace_1 = require("../trace");
 const prepareReq = (req, res, next) => {
     const url = (0, url_1.parse)(req.url, false);
     req.pathname = url.pathname || '/';
@@ -140,6 +142,9 @@ class Server {
         return router;
     }
     _handleRequest(req, res, next) {
+        const requestId = (0, uuid_1.v4)();
+        req._traces = (0, trace_1.initTrace)(requestId);
+        req._requestId = requestId;
         this._router.handleRequest(req, res, next || ((err) => this._finalhandler(req, res, err)));
     }
     _checkPort(port) {

package/lib/server/http-server/serverTypes.d.ts

@@ -1,11 +1,17 @@
 /// <reference types="node" />
 import { IncomingMessage, ServerResponse } from 'http';
 import { IParams, ParsedQuery as IQuery } from '@shuvi/router';
+import { Span } from '../../trace';
 export interface IRequest extends IncomingMessage {
     url: string;
     pathname: string;
     query: IQuery;
     params: IParams;
+    _requestId: string;
+    _traces: {
+        serverCreateAppTrace: Span;
+        serverRequestTrace: Span;
+    };
 }
 export interface IResponse extends ServerResponse {
 }

package/lib/server/middlewares/getAssetMiddleware.js

@@ -16,7 +16,7 @@ const utils_1 = require("../utils");
 const { SHUVI_SERVER_RUN_ASSET_MIDDLEWARE } = trace_1.SERVER_REQUEST.events;
 const getAssetMiddleware = (context) => {
     return (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
-        const { serverRequestTrace } = context.traces;
+        const { serverRequestTrace } = req._traces;
         const candidatePaths = [];
         try {
             const fullUrl = new URL(req.url, `http://${req.headers.host}`);
@@ -46,7 +46,7 @@ const getAssetMiddleware = (context) => {
             if (!(0, utils_1.isStaticFileExist)(assetAbsPath)) {
                 continue;
             }
-            const runAssetMiddlewareTrace = serverRequestTrace.traceChild(SHUVI_SERVER_RUN_ASSET_MIDDLEWARE.name);
+            const runAssetMiddlewareTrace = serverRequestTrace.traceChild(SHUVI_SERVER_RUN_ASSET_MIDDLEWARE.name, { [SHUVI_SERVER_RUN_ASSET_MIDDLEWARE.attrs.requestId]: req._requestId });
             let err = null;
             try {
                 yield (0, utils_1.serveStatic)(req, res, assetAbsPath);

package/lib/server/plugin.d.ts

@@ -1,14 +1,9 @@
 import { IPluginInstance, IPluginHandlers, HookMap } from '@shuvi/hook';
 import { IPluginContext } from '../core';
 import { CustomServerPluginHooks } from './pluginTypes';
-import { Span } from '../trace';
 export * from './pluginTypes';
 export interface IServerPluginContext extends IPluginContext {
     serverPluginRunner: PluginManager['runner'];
-    traces: {
-        serverCreateAppTrace: Span;
-        serverRequestTrace: Span;
-    };
 }
 export declare type PluginManager = ReturnType<typeof getManager>;
 export declare type PluginRunner = PluginManager['runner'];

package/lib/server/plugin.js

@@ -18,7 +18,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.initServerPlugins = exports.createServerPluginAfter = exports.createServerPlugin = exports.createServerPluginBefore = exports.getManager = void 0;
 const hook_1 = require("@shuvi/hook");
 const plugins_1 = require("@shuvi/shared/plugins");
-const trace_1 = require("./trace");
 __exportStar(require("./pluginTypes"), exports);
 const listen = (0, hook_1.createAsyncParallelHook)();
 const internalHooks = {
@@ -29,11 +28,7 @@ exports.getManager = getManager;
 _a = (0, plugins_1.createPluginCreator)(), exports.createServerPluginBefore = _a.createPluginBefore, exports.createServerPlugin = _a.createPlugin, exports.createServerPluginAfter = _a.createPluginAfter;
 const initServerPlugins = (manager, serverPlugins, pluginContext) => {
     const serverContext = Object.assign({
-        serverPluginRunner: manager.runner,
-        traces: {
-            serverCreateAppTrace: trace_1.serverCreateAppTrace,
-            serverRequestTrace: trace_1.serverRequestTrace
-        }
+        serverPluginRunner: manager.runner
     }, pluginContext);
     manager.setContext(serverContext);
     serverPlugins.forEach(plugin => {

package/lib/server/trace.d.ts

@@ -1,2 +1,4 @@
-export declare const serverCreateAppTrace: import("../trace").Span;
-export declare const serverRequestTrace: import("../trace").Span;
+export declare function initTrace(requestId: string): {
+    serverCreateAppTrace: import("../trace").Span;
+    serverRequestTrace: import("../trace").Span;
+};

package/lib/server/trace.js

@@ -1,7 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.serverRequestTrace = exports.serverCreateAppTrace = void 0;
+exports.initTrace = void 0;
 const trace_1 = require("@shuvi/shared/constants/trace");
 const trace_2 = require("../trace");
-exports.serverCreateAppTrace = (0, trace_2.trace)(trace_1.SERVER_CREATE_APP.name);
-exports.serverRequestTrace = (0, trace_2.trace)(trace_1.SERVER_REQUEST.name);
+function initTrace(requestId) {
+    const serverCreateAppTrace = (0, trace_2.trace)(trace_1.SERVER_CREATE_APP.name);
+    serverCreateAppTrace.setAttribute(trace_1.SERVER_CREATE_APP.attrs.requestId, requestId);
+    const serverRequestTrace = (0, trace_2.trace)(trace_1.SERVER_REQUEST.name);
+    serverRequestTrace.setAttribute(trace_1.SERVER_REQUEST.attrs.requestId, requestId);
+    return {
+        serverCreateAppTrace,
+        serverRequestTrace
+    };
+}
+exports.initTrace = initTrace;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/service",
-  "version": "1.0.33",
+  "version": "1.0.34",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -29,14 +29,14 @@
     "@babel/generator": "7.14.5",
     "@babel/parser": "7.14.7",
     "@babel/traverse": "7.14.7",
-    "@shuvi/hook": "1.0.33",
-    "@shuvi/router": "1.0.33",
-    "@shuvi/runtime": "1.0.33",
-    "@shuvi/shared": "1.0.33",
-    "@shuvi/toolpack": "1.0.33",
-    "@shuvi/utils": "1.0.33",
-    "@shuvi/error-overlay": "1.0.33",
-    "@shuvi/reporters": "1.0.33",
+    "@shuvi/hook": "1.0.34",
+    "@shuvi/router": "1.0.34",
+    "@shuvi/runtime": "1.0.34",
+    "@shuvi/shared": "1.0.34",
+    "@shuvi/toolpack": "1.0.34",
+    "@shuvi/utils": "1.0.34",
+    "@shuvi/error-overlay": "1.0.34",
+    "@shuvi/reporters": "1.0.34",
     "commander": "5.1.0",
     "comment-json": "4.2.2",
     "cross-spawn": "7.0.3",
@@ -47,6 +47,7 @@
     "cookie": "0.4.1",
     "send": "0.17.1",
     "ws": "8.2.3",
+    "uuid": "9.0.0",
     "dotenv": "16.0.3",
     "dotenv-expand": "9.0.0",
     "find-up": "4.1.0"
@@ -60,6 +61,7 @@
     "@types/detect-port": "1.3.0",
     "@types/cookie": "^0.4.1",
     "@types/ejs": "3.0.4",
+    "@types/uuid": "^9.0.2",
     "@types/ws": "8.2.0"
   }
 }