@shuvi/service 1.0.32 → 1.0.33

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

@@ -8,6 +8,8 @@ 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");
 class RouterImpl {
     constructor(options) {
         this._routes = [];
@@ -35,6 +37,9 @@ class RouterImpl {
         return this;
     }
     handleRequest(req, res, out) {
+        trace_1.serverRequestTrace
+            .traceChild(trace_2.SERVER_REQUEST.events.SHUVI_SERVER_HANDLE_REQUEST_START.name)
+            .stop();
         let index = 0;
         let done = err => out(err);
         const next = err => {

package/lib/server/middlewares/getAssetMiddleware.js

@@ -10,10 +10,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAssetMiddleware = void 0;
+const trace_1 = require("@shuvi/shared/constants/trace");
 const constants_1 = require("../../constants");
 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 candidatePaths = [];
         try {
             const fullUrl = new URL(req.url, `http://${req.headers.host}`);
@@ -43,9 +46,16 @@ const getAssetMiddleware = (context) => {
             if (!(0, utils_1.isStaticFileExist)(assetAbsPath)) {
                 continue;
             }
+            const runAssetMiddlewareTrace = serverRequestTrace.traceChild(SHUVI_SERVER_RUN_ASSET_MIDDLEWARE.name);
             let err = null;
             try {
-                return yield (0, utils_1.serveStatic)(req, res, assetAbsPath);
+                yield (0, utils_1.serveStatic)(req, res, assetAbsPath);
+                runAssetMiddlewareTrace.setAttributes({
+                    [SHUVI_SERVER_RUN_ASSET_MIDDLEWARE.attrs.error.name]: false,
+                    [SHUVI_SERVER_RUN_ASSET_MIDDLEWARE.attrs.statusCode.name]: res.statusCode
+                });
+                runAssetMiddlewareTrace.stop();
+                return;
             }
             catch (error) {
                 if (error.code === 'ENOENT') {
@@ -54,6 +64,11 @@ const getAssetMiddleware = (context) => {
                 err = error;
             }
             if (err) {
+                runAssetMiddlewareTrace.setAttributes({
+                    [SHUVI_SERVER_RUN_ASSET_MIDDLEWARE.attrs.error.name]: true,
+                    [SHUVI_SERVER_RUN_ASSET_MIDDLEWARE.attrs.statusCode.name]: (err === null || err === void 0 ? void 0 : err.statusCode) || res.statusCode
+                });
+                runAssetMiddlewareTrace.stop();
                 return next(err);
             }
         }

package/lib/server/plugin.js

@@ -18,8 +18,7 @@ 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("@shuvi/shared/constants/trace");
-const trace_2 = require("../trace");
+const trace_1 = require("./trace");
 __exportStar(require("./pluginTypes"), exports);
 const listen = (0, hook_1.createAsyncParallelHook)();
 const internalHooks = {
@@ -32,8 +31,8 @@ const initServerPlugins = (manager, serverPlugins, pluginContext) => {
     const serverContext = Object.assign({
         serverPluginRunner: manager.runner,
         traces: {
-            serverCreateAppTrace: (0, trace_2.trace)(trace_1.SERVER_CREATE_APP.name),
-            serverRequestTrace: (0, trace_2.trace)(trace_1.SERVER_REQUEST.name)
+            serverCreateAppTrace: trace_1.serverCreateAppTrace,
+            serverRequestTrace: trace_1.serverRequestTrace
         }
     }, pluginContext);
     manager.setContext(serverContext);

package/lib/server/shuviServer.js

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ShuviServer = void 0;
-const trace_1 = require("@shuvi/shared/constants/trace");
 const string_1 = require("@shuvi/utils/string");
 const serverMiddleware_1 = require("./serverMiddleware");
 const http_server_1 = require("./http-server");
@@ -40,9 +39,6 @@ class ShuviServer {
         return __awaiter(this, void 0, void 0, function* () {
             const { _serverContext: context, _server: server } = this;
             server.use(((req, resp, next) => {
-                context.traces.serverRequestTrace
-                    .traceChild(trace_1.SERVER_REQUEST.events.SHUVI_SERVER_HANDLE_REQUEST_START.name)
-                    .stop();
                 this._normalizeReq(req);
                 this._normalizeResp(resp);
                 next();

package/lib/server/trace.d.ts

@@ -0,0 +1,2 @@
+export declare const serverCreateAppTrace: import("../trace").Span;
+export declare const serverRequestTrace: import("../trace").Span;

package/lib/server/trace.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.serverRequestTrace = exports.serverCreateAppTrace = 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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/service",
-  "version": "1.0.32",
+  "version": "1.0.33",
   "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.32",
-    "@shuvi/router": "1.0.32",
-    "@shuvi/runtime": "1.0.32",
-    "@shuvi/shared": "1.0.32",
-    "@shuvi/toolpack": "1.0.32",
-    "@shuvi/utils": "1.0.32",
-    "@shuvi/error-overlay": "1.0.32",
-    "@shuvi/reporters": "1.0.32",
+    "@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",
     "commander": "5.1.0",
     "comment-json": "4.2.2",
     "cross-spawn": "7.0.3",