@teamscale/coverage-collector 0.0.1-beta.29 → 0.0.1-beta.32

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@teamscale/coverage-collector",
-    "version": "0.0.1-beta.29",
+    "version": "0.0.1-beta.32",
     "description": "Collector for JavaScript code coverage information",
     "main": "dist/src/main.js",
     "bin": "dist/src/main.js",
@@ -24,15 +24,16 @@
     "dependencies": {
         "@cqse/commons": "^0.0.1-beta.26",
         "argparse": "^2.0.1",
-        "async": "^3.2.0",
+        "async": "^3.2.3",
         "axios": "^0.24.0",
+        "bunyan": "^1.8.15",
         "dotenv": "^14.1.0",
         "form-data": "^4.0.0",
+        "mkdirp": "^1.0.4",
         "rxjs": "^7.1.0",
         "source-map": "^0.7.3",
         "tmp": "^0.2.1",
         "typescript-optional": "^2.0.1",
-        "winston": "^3.6.0",
         "ws": "^7.4.5"
     },
     "devDependencies": {
@@ -40,11 +41,11 @@
         "@babel/preset-env": "^7.14.1",
         "@types/argparse": "^2.0.5",
         "@types/async": "^3.2.6",
+        "@types/bunyan": "^1.8.8",
         "@types/jest": "^27.0.1",
         "@types/node": "^15.0.1",
         "@types/source-map": "^0.5.7",
         "@types/tmp": "^0.2.3",
-        "@types/winston": "^2.4.4",
         "@types/ws": "^7.4.2",
         "babel-jest": "^27.2.0",
         "esbuild": "^0.13.4",

package/dist/src/main.js

@@ -30,7 +30,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Main = void 0;
 const package_json_1 = require("../package.json");
 const argparse_1 = require("argparse");
-const winston_1 = __importDefault(require("winston"));
+const bunyan_1 = __importDefault(require("bunyan"));
 const DataStorage_1 = require("./storage/DataStorage");
 const CollectingServer_1 = require("./receiver/CollectingServer");
 require("dotenv/config");
@@ -40,6 +40,8 @@ const form_data_1 = __importDefault(require("form-data"));
 const QueryParameters_1 = __importDefault(require("./utils/QueryParameters"));
 const util_1 = require("util");
 const tmp_1 = __importDefault(require("tmp"));
+const mkdirp_1 = __importDefault(require("mkdirp"));
+const path_1 = __importDefault(require("path"));
 /**
  * The main class of the Teamscale JavaScript Collector.
  * Used to start the collector for with a given configuration.
@@ -117,16 +119,25 @@ class Main {
      * Construct the logger.
      */
     static buildLogger(config) {
-        return winston_1.default.createLogger({
-            level: config.log_level,
-            format: winston_1.default.format.json(),
-            defaultMeta: {},
-            transports: [
-                new winston_1.default.transports.File({ filename: 'logs/collector-error.log', level: 'error' }),
-                new winston_1.default.transports.File({ filename: config.log_to_file.trim() }),
-                new winston_1.default.transports.Console({ format: winston_1.default.format.simple(), level: config.log_level })
-            ]
-        });
+        const logfilePath = config.log_to_file.trim();
+        mkdirp_1.default.sync(path_1.default.dirname(logfilePath));
+        const logLevel = config.log_level;
+        return bunyan_1.default.createLogger({ name: "Instrumenter",
+            streams: [
+                {
+                    level: logLevel,
+                    stream: {
+                        write: (rec) => {
+                            console.log('[%s] %s: %s', rec.time.toISOString(), bunyan_1.default.nameFromLevel[rec.level], rec.msg);
+                        }
+                    },
+                    type: 'raw'
+                },
+                {
+                    level: logLevel,
+                    path: logfilePath
+                }
+            ] });
     }
     /**
      * Entry point of the Teamscale JavaScript Profiler.

package/dist/src/receiver/CollectingServer.d.ts

@@ -1,5 +1,5 @@
 import { IDataStorage } from '../storage/DataStorage';
-import { Logger } from 'winston';
+import Logger from "bunyan";
 /**
  * Various constants that are used to exchange data between
  * the instrumented application and the coverage collector.

package/dist/src/receiver/Session.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { Socket } from 'net';
 import { IDataStorage } from '../storage/DataStorage';
-import { Logger } from 'winston';
+import Logger from "bunyan";
 /**
  * The session maintains the relevant information for a client.
  * One session is created for each client.

package/dist/src/storage/DataStorage.d.ts

@@ -1,4 +1,4 @@
-import { Logger } from 'winston';
+import Logger from "bunyan";
 /**
  * Lines covered for the specified file.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamscale/coverage-collector",
-  "version": "0.0.1-beta.29",
+  "version": "0.0.1-beta.32",
   "description": "Collector for JavaScript code coverage information",
   "main": "dist/src/main.js",
   "bin": "dist/src/main.js",
@@ -24,15 +24,16 @@
   "dependencies": {
     "@cqse/commons": "^0.0.1-beta.26",
     "argparse": "^2.0.1",
-    "async": "^3.2.0",
+    "async": "^3.2.3",
     "axios": "^0.24.0",
+    "bunyan": "^1.8.15",
     "dotenv": "^14.1.0",
     "form-data": "^4.0.0",
+    "mkdirp": "^1.0.4",
     "rxjs": "^7.1.0",
     "source-map": "^0.7.3",
     "tmp": "^0.2.1",
     "typescript-optional": "^2.0.1",
-    "winston": "^3.6.0",
     "ws": "^7.4.5"
   },
   "devDependencies": {
@@ -40,11 +41,11 @@
     "@babel/preset-env": "^7.14.1",
     "@types/argparse": "^2.0.5",
     "@types/async": "^3.2.6",
+    "@types/bunyan": "^1.8.8",
     "@types/jest": "^27.0.1",
     "@types/node": "^15.0.1",
     "@types/source-map": "^0.5.7",
     "@types/tmp": "^0.2.3",
-    "@types/winston": "^2.4.4",
     "@types/ws": "^7.4.2",
     "babel-jest": "^27.2.0",
     "esbuild": "^0.13.4",